diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2010-03-25 13:14:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-30 09:25:08 -0700 |
| commit | 3d0bfbf25957e04354389047f0e6ba520d58487c (patch) | |
| tree | 4d40a1b4a3b8995ce10d0c9dde3d0f32cbf53eb9 /drivers/usb/musb/musb_core.c | |
| parent | 1fb48f4a96ef3d4eee0a13b92a3e8489171b47c9 (diff) | |
| download | lwn-3d0bfbf25957e04354389047f0e6ba520d58487c.tar.gz lwn-3d0bfbf25957e04354389047f0e6ba520d58487c.zip | |
musb_core: don't prevent disabling clock on driver unload
Resetting 'musb->clock' to NULL in musb_shutdown() prevents musb_platform_exit()
from properly disabling the clock when unloading the driver -- don't do 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/musb/musb_core.c')
| -rw-r--r-- | drivers/usb/musb/musb_core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 03544de751ef..8b68f21d3f82 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -965,10 +965,8 @@ static void musb_shutdown(struct platform_device *pdev) spin_lock_irqsave(&musb->lock, flags); musb_platform_disable(musb); musb_generic_disable(musb); - if (musb->clock) { + if (musb->clock) clk_put(musb->clock); - musb->clock = NULL; - } spin_unlock_irqrestore(&musb->lock, flags); /* FIXME power down */ |