diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2010-03-25 07:14:28 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-30 12:25:08 -0400 |
commit | 1fb48f4a96ef3d4eee0a13b92a3e8489171b47c9 (patch) | |
tree | 8586216df0b1b0f3ddf3ef17e138b90cbb7fe1e9 /drivers/usb | |
parent | 714bc5ef3edaec3ca0cf155fe01411760527c52e (diff) |
musb_core: don't touch 'musb->clock' in musb_free()
Remove duplicate/unbalanced calls to clk_disable()/clk_put() in musb_free():
- clk_disable() is called by musb_platform_exit() just prior to this call;
- clk_put() is called by the callers of musb_free() prior to calling it...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/musb/musb_core.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 3342b82d4e53..03544de751ef 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c | |||
@@ -1857,11 +1857,6 @@ static void musb_free(struct musb *musb) | |||
1857 | musb_platform_exit(musb); | 1857 | musb_platform_exit(musb); |
1858 | musb_writeb(musb->mregs, MUSB_DEVCTL, 0); | 1858 | musb_writeb(musb->mregs, MUSB_DEVCTL, 0); |
1859 | 1859 | ||
1860 | if (musb->clock) { | ||
1861 | clk_disable(musb->clock); | ||
1862 | clk_put(musb->clock); | ||
1863 | } | ||
1864 | |||
1865 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | 1860 | #ifdef CONFIG_USB_MUSB_HDRC_HCD |
1866 | usb_put_hcd(musb_to_hcd(musb)); | 1861 | usb_put_hcd(musb_to_hcd(musb)); |
1867 | #else | 1862 | #else |