diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 04:38:34 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 04:38:34 (GMT) |
commit | 37aa48368f2508defb1976be62e1ed6ca4dde683 (patch) | |
tree | 59b606c740ddd10259fbf2248bb50498a319fa6d /drivers/ata/pata_samsung_cf.c | |
parent | 1da4f83c0c43f25baf356c4cc719255877da6b1e (diff) | |
parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
download | linux-37aa48368f2508defb1976be62e1ed6ca4dde683.tar.xz |
Merge 3.15-rc3 into staging-next
Diffstat (limited to 'drivers/ata/pata_samsung_cf.c')
-rw-r--r-- | drivers/ata/pata_samsung_cf.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c index a79566d..0610e78 100644 --- a/drivers/ata/pata_samsung_cf.c +++ b/drivers/ata/pata_samsung_cf.c @@ -594,9 +594,13 @@ static int __init pata_s3c_probe(struct platform_device *pdev) platform_set_drvdata(pdev, host); - return ata_host_activate(host, info->irq, - info->irq ? pata_s3c_irq : NULL, - 0, &pata_s3c_sht); + ret = ata_host_activate(host, info->irq, + info->irq ? pata_s3c_irq : NULL, + 0, &pata_s3c_sht); + if (ret) + goto stop_clk; + + return 0; stop_clk: clk_disable(info->clk); |