releases/2.6.35.9/usb-musb-blackfin-call-gpio_free-on-error-path-in-musb_platform_init.patch

   1 From 00be545e49d83485d49a598d3b7e090088934be8 Mon Sep 17 00:00:00 2001
   2 From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
   3 Date: Wed, 29 Sep 2010 09:54:31 +0300
   4 Subject: usb: musb: blackfin: call gpio_free() on error path in musb_platform_init()
   5
   6 From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
   7
   8 commit 00be545e49d83485d49a598d3b7e090088934be8 upstream.
   9
  10 Blackfin's musb_platform_init() needs to call gpio_free() for error cleanup iff
  11 otg_get_transceiver() call returns NULL.
  12
  13 Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
  14 Acked-by: Mike Frysinger <vapier@gentoo.org>
  15 Signed-off-by: Felipe Balbi <balbi@ti.com>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  17
  18 ---
  19  drivers/usb/musb/blackfin.c |    4 +++-
  20  1 file changed, 3 insertions(+), 1 deletion(-)
  21
  22 --- a/drivers/usb/musb/blackfin.c
  23 +++ b/drivers/usb/musb/blackfin.c
  24 @@ -342,8 +342,10 @@ int __init musb_platform_init(struct mus
  25
  26         usb_nop_xceiv_register();
  27         musb->xceiv = otg_get_transceiver();
  28 -       if (!musb->xceiv)
  29 +       if (!musb->xceiv) {
  30 +               gpio_free(musb->config->gpio_vrsel);
  31                 return -ENODEV;
  32 +       }
  33
  34         if (ANOMALY_05000346) {
  35                 bfin_write_USB_APHY_CALIB(ANOMALY_05000346_value);