lkml.org 
[lkml]   [2011]   [Jan]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 247/260] usb: musb: blackfin: call gpio_free() on error path in musb_platform_init()
    Date
    From: Sergei Shtylyov <sshtylyov@ru.mvista.com>

    commit 00be545e49d83485d49a598d3b7e090088934be8 upstream.

    Blackfin's musb_platform_init() needs to call gpio_free() for error cleanup iff
    otg_get_transceiver() call returns NULL.

    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Acked-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Felipe Balbi <balbi@ti.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/usb/musb/blackfin.c | 4 +++-
    1 files changed, 3 insertions(+), 1 deletions(-)

    diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
    index ec8d324..6a9e891 100644
    --- a/drivers/usb/musb/blackfin.c
    +++ b/drivers/usb/musb/blackfin.c
    @@ -289,8 +289,10 @@ int __init musb_platform_init(struct musb *musb)

    usb_nop_xceiv_register();
    musb->xceiv = otg_get_transceiver();
    - if (!musb->xceiv)
    + if (!musb->xceiv) {
    + gpio_free(musb->config->gpio_vrsel);
    return -ENODEV;
    + }

    if (ANOMALY_05000346) {
    bfin_write_USB_APHY_CALIB(ANOMALY_05000346_value);
    --
    1.7.3.3


    \
     
     \ /
      Last update: 2011-01-02 08:59    [W:4.492 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site