| Message ID | 6050762.sdUI3gZZlK@amdc1032 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tuesday, April 01, 2014 2:53 AM, Tejun Heo wrote: > > 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> Best regards, Jingoo Han > --- > drivers/ata/pata_samsung_cf.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > Index: b/drivers/ata/pata_samsung_cf.c > =================================================================== > --- a/drivers/ata/pata_samsung_cf.c 2014-03-14 16:45:04.344724378 +0100 > +++ b/drivers/ata/pata_samsung_cf.c 2014-03-31 18:31:58.083631437 +0200 > @@ -594,9 +594,13 @@ static int __init pata_s3c_probe(struct > > 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); > > --
Hi, Tejun, could you please also pick this one? Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics On Tuesday, April 01, 2014 10:18:46 AM Jingoo Han wrote: > On Tuesday, April 01, 2014 2:53 AM, Tejun Heo wrote: > > > > 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> > > Best regards, > Jingoo Han > > > --- > > drivers/ata/pata_samsung_cf.c | 10 +++++++--- > > 1 file changed, 7 insertions(+), 3 deletions(-) > > > > Index: b/drivers/ata/pata_samsung_cf.c > > =================================================================== > > --- a/drivers/ata/pata_samsung_cf.c 2014-03-14 16:45:04.344724378 +0100 > > +++ b/drivers/ata/pata_samsung_cf.c 2014-03-31 18:31:58.083631437 +0200 > > @@ -594,9 +594,13 @@ static int __init pata_s3c_probe(struct > > > > 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); > > > > --
On Mon, Mar 31, 2014 at 07:52:44PM +0200, Bartlomiej Zolnierkiewicz wrote: > 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> Applied to libata/for-3.15-fixes. Thanks.
Index: b/drivers/ata/pata_samsung_cf.c =================================================================== --- a/drivers/ata/pata_samsung_cf.c 2014-03-14 16:45:04.344724378 +0100 +++ b/drivers/ata/pata_samsung_cf.c 2014-03-31 18:31:58.083631437 +0200 @@ -594,9 +594,13 @@ static int __init pata_s3c_probe(struct 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);
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> --- drivers/ata/pata_samsung_cf.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)