]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
musb_core: don't prevent disabling clock on driver unload
authorSergei Shtylyov <sshtylyov@ru.mvista.com>
Thu, 25 Mar 2010 11:14:29 +0000 (13:14 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 30 Apr 2010 16:25:08 +0000 (09:25 -0700)
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>
drivers/usb/musb/musb_core.c

index 03544de751efdcfb44b3459b3569fe07044431f4..8b68f21d3f8220a05920fc7ca99e1464d919b92c 100644 (file)
@@ -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 */