lkml.org 
[lkml]   [2014]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 037/214] pata_at91: fix ata_host_activate() failure handling
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

    commit 27aa64b9d1bd0d23fd692c91763a48309b694311 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/ata/pata_at91.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    --- a/drivers/ata/pata_at91.c
    +++ b/drivers/ata/pata_at91.c
    @@ -408,12 +408,13 @@ static int __devinit pata_at91_probe(str

    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);



    \
     
     \ /
      Last update: 2014-06-05 22:21    [W:2.552 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site