| Message ID | 1706948.xQXQIMFS2B@amdc1032 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Apr 14, 2014 at 9:31 PM, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> wrote: > 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> > --- > v2: > - re-order code and then drop redundant goto statement > > drivers/ata/pata_arasan_cf.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
On Mon, Apr 14, 2014 at 06:01:47PM +0200, Bartlomiej Zolnierkiewicz wrote: > 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> Applied to libata/for-3.15-fixes. Thanks.
Index: b/drivers/ata/pata_arasan_cf.c =================================================================== --- a/drivers/ata/pata_arasan_cf.c 2014-04-14 17:26:27.308294246 +0200 +++ b/drivers/ata/pata_arasan_cf.c 2014-04-14 17:44:41.868314795 +0200 @@ -898,9 +898,12 @@ static int arasan_cf_probe(struct platfo 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;
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> --- v2: - re-order code and then drop redundant goto statement drivers/ata/pata_arasan_cf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)