summaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_arasan_cf.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz2014-04-14 18:01:47 +0200
committerTejun Heo2014-04-14 19:50:03 +0200
commit151eea367c720db8a0768caf47894c32991aa02a (patch)
treed1353a6c13c12d23685702667d2accd1686931c2 /drivers/ata/pata_arasan_cf.c
parentata: fix i.MX AHCI driver dependencies (diff)
downloadkernel-qcow2-linux-151eea367c720db8a0768caf47894c32991aa02a.tar.gz
kernel-qcow2-linux-151eea367c720db8a0768caf47894c32991aa02a.tar.xz
kernel-qcow2-linux-151eea367c720db8a0768caf47894c32991aa02a.zip
pata_arasan_cf: fix ata_host_activate() failure handling
Add missing cf_exit() and clk_put() calls to ata_host_activate() failure path. Cc: Viresh Kumar <viresh.linux@gmail.com> Cc: Shiraz Hashim <shiraz.hashim@st.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/pata_arasan_cf.c')
-rw-r--r--drivers/ata/pata_arasan_cf.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 6fac524c2f50..4edb1a81f63f 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -898,9 +898,12 @@ static int arasan_cf_probe(struct platform_device *pdev)
cf_card_detect(acdev, 0);
- return ata_host_activate(host, acdev->irq, irq_handler, 0,
- &arasan_cf_sht);
+ ret = ata_host_activate(host, acdev->irq, irq_handler, 0,
+ &arasan_cf_sht);
+ if (!ret)
+ return 0;
+ cf_exit(acdev);
free_clk:
clk_put(acdev->clk);
return ret;