| From 00be545e49d83485d49a598d3b7e090088934be8 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sshtylyov@ru.mvista.com> |
| Date: Wed, 29 Sep 2010 09:54:31 +0300 |
| Subject: usb: musb: blackfin: call gpio_free() on error path in musb_platform_init() |
| |
| 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> |
| |
| --- |
| drivers/usb/musb/blackfin.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/usb/musb/blackfin.c |
| +++ b/drivers/usb/musb/blackfin.c |
| @@ -248,8 +248,10 @@ int __init musb_platform_init(struct mus |
| |
| 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); |
