diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2014-03-31 19:52:44 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-04-15 08:48:56 -0400 |
| commit | 3608aeff47034faee7518ddec52d77fb811e952c (patch) | |
| tree | 90fb014b13be0aa432aac02d27bdab56c22a2bd0 /drivers/ata/pata_samsung_cf.c | |
| parent | 151eea367c720db8a0768caf47894c32991aa02a (diff) | |
| download | talos-obmc-linux-3608aeff47034faee7518ddec52d77fb811e952c.tar.gz talos-obmc-linux-3608aeff47034faee7518ddec52d77fb811e952c.zip | |
pata_samsung_cf: fix ata_host_activate() failure handling
Add missing clk_disable() call to ata_host_activate() failure path.
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
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 a79566d05666..0610e78c8a2a 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); |
