* [PATCH] pata_at91: fix ata_host_activate() failure handling
@ 2014-03-31 17:51 Bartlomiej Zolnierkiewicz
2014-03-31 17:59 ` Sergei Shtylyov
2014-04-02 17:19 ` Tejun Heo
0 siblings, 2 replies; 3+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-03-31 17:51 UTC (permalink / raw)
To: linux-arm-kernel
Add missing clk_put() call to ata_host_activate() failure path.
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---
drivers/ata/pata_at91.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
Index: b/drivers/ata/pata_at91.c
===================================================================
--- a/drivers/ata/pata_at91.c 2014-03-14 16:45:04.196724381 +0100
+++ b/drivers/ata/pata_at91.c 2014-03-31 17:46:40.127677782 +0200
@@ -407,12 +407,13 @@ static int pata_at91_probe(struct platfo
host->private_data = info;
- return ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
- gpio_is_valid(irq) ? ata_sff_interrupt : NULL,
- irq_flags, &pata_at91_sht);
+ ret = ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
+ gpio_is_valid(irq) ? ata_sff_interrupt : NULL,
+ irq_flags, &pata_at91_sht);
+ if (ret)
+ goto err_put;
- if (!ret)
- return 0;
+ return 0;
err_put:
clk_put(info->mck);
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] pata_at91: fix ata_host_activate() failure handling
2014-03-31 17:51 [PATCH] pata_at91: fix ata_host_activate() failure handling Bartlomiej Zolnierkiewicz
@ 2014-03-31 17:59 ` Sergei Shtylyov
2014-04-02 17:19 ` Tejun Heo
1 sibling, 0 replies; 3+ messages in thread
From: Sergei Shtylyov @ 2014-03-31 17:59 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 03/31/2014 09:51 PM, Bartlomiej Zolnierkiewicz wrote:
> Add missing clk_put() call to ata_host_activate() failure path.
> Cc: Andrew Victor <linux@maxim.org.za>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> ---
> drivers/ata/pata_at91.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
> Index: b/drivers/ata/pata_at91.c
> ===================================================================
> --- a/drivers/ata/pata_at91.c 2014-03-14 16:45:04.196724381 +0100
> +++ b/drivers/ata/pata_at91.c 2014-03-31 17:46:40.127677782 +0200
> @@ -407,12 +407,13 @@ static int pata_at91_probe(struct platfo
>
> host->private_data = info;
>
> - return ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
> - gpio_is_valid(irq) ? ata_sff_interrupt : NULL,
> - irq_flags, &pata_at91_sht);
> + ret = ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
> + gpio_is_valid(irq) ? ata_sff_interrupt : NULL,
> + irq_flags, &pata_at91_sht);
> + if (ret)
> + goto err_put;
>
> - if (!ret)
> - return 0;
> + return 0;
Hm, I have once fixed that (see that *if* (!ret)) but looks like a later
commit 477c87e90853d136b188c50c0e4a93d01cad872e (ARM: at91/pata: use
gpio_is_valid to check the gpio) broke it again. :-( Would be good if the
changelog did mention that...
MBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] pata_at91: fix ata_host_activate() failure handling
2014-03-31 17:51 [PATCH] pata_at91: fix ata_host_activate() failure handling Bartlomiej Zolnierkiewicz
2014-03-31 17:59 ` Sergei Shtylyov
@ 2014-04-02 17:19 ` Tejun Heo
1 sibling, 0 replies; 3+ messages in thread
From: Tejun Heo @ 2014-04-02 17:19 UTC (permalink / raw)
To: linux-arm-kernel
Applied to libata/for-3.15-fixes.
Thanks.
------- 8< -------
>From 27aa64b9d1bd0d23fd692c91763a48309b694311 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Date: Mon, 31 Mar 2014 19:51:14 +0200
Add missing clk_put() call to ata_host_activate() failure path.
Sergei says,
"Hm, I have once fixed that (see that *if* (!ret)) but looks like a
later commit 477c87e90853d136b188c50c0e4a93d01cad872e (ARM:
at91/pata: use gpio_is_valid to check the gpio) broke it again. :-(
Would be good if the changelog did mention that..."
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: stable at vger.kernel.org
---
drivers/ata/pata_at91.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
index e9c8727..8a66f23 100644
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@ -407,12 +407,13 @@ static int pata_at91_probe(struct platform_device *pdev)
host->private_data = info;
- return ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
- gpio_is_valid(irq) ? ata_sff_interrupt : NULL,
- irq_flags, &pata_at91_sht);
+ ret = ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
+ gpio_is_valid(irq) ? ata_sff_interrupt : NULL,
+ irq_flags, &pata_at91_sht);
+ if (ret)
+ goto err_put;
- if (!ret)
- return 0;
+ return 0;
err_put:
clk_put(info->mck);
--
1.9.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-02 17:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-31 17:51 [PATCH] pata_at91: fix ata_host_activate() failure handling Bartlomiej Zolnierkiewicz
2014-03-31 17:59 ` Sergei Shtylyov
2014-04-02 17:19 ` Tejun Heo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).