summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSergei Shtylyov <sshtylyov@ru.mvista.com>2010-03-25 13:14:30 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-30 09:25:08 -0700
commit13962c747915e4d7ef4cf92c36bd06a7fe648f0b (patch)
tree636a85ddad1ba7f5289b00647ed85bde395d82e2 /drivers
parent3d0bfbf25957e04354389047f0e6ba520d58487c (diff)
downloadlinux-3.10-13962c747915e4d7ef4cf92c36bd06a7fe648f0b.tar.gz
linux-3.10-13962c747915e4d7ef4cf92c36bd06a7fe648f0b.tar.bz2
linux-3.10-13962c747915e4d7ef4cf92c36bd06a7fe648f0b.zip
MUSB: DaVinci: fix musb_platform_init() error cleanup path
This function forgets to call clk_disable() iff reading the USB module version register returns 0. Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/musb/davinci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 29bce5c0fd1..ce2e16fee0d 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -444,6 +444,8 @@ int __init musb_platform_init(struct musb *musb)
return 0;
fail:
+ clk_disable(musb->clock);
+
usb_nop_xceiv_unregister();
return -ENODEV;
}