musb_core: don't prevent disabling clock on driver unload

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Linux Kernel Mailing List
Date: Friday, April 30, 2010 - 10:59 am

Gitweb:     http://git.kernel.org/linus/3d0bfbf25957e04354389047f0e6ba520d58487c
Commit:     3d0bfbf25957e04354389047f0e6ba520d58487c
Parent:     1fb48f4a96ef3d4eee0a13b92a3e8489171b47c9
Author:     Sergei Shtylyov <sshtylyov@ru.mvista.com>
AuthorDate: Thu Mar 25 13:14:29 2010 +0200
Committer:  Greg Kroah-Hartman <gregkh@suse.de>
CommitDate: Fri Apr 30 09:25:08 2010 -0700

    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>
---
 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 03544de..8b68f21 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 */
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
musb_core: don't prevent disabling clock on driver unload, Linux Kernel Mailing ..., (Fri Apr 30, 10:59 am)