From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Fri, 15 Aug 2008 07:49:41 +0000 (+0300)
Subject: ARCH: OMAP: MUSB: Do not block sleep
X-Git-Tag: v2.6.27-omap1~303
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ef05b8396b1685f994ffb518680d82075fce3b99;p=linux-2.6-omap-h63xx.git

ARCH: OMAP: MUSB: Do not block sleep

arch: omap: usb: do not block sleep

musb_set_clock should not block sleep on omap3-based
boards, it prevents system from sleeping.

Thanks to Jouni Högander for pointing this out

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 71ddf55aee3..3f90a933ab2 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -58,7 +58,6 @@ static int musb_set_clock(struct clk *clk, int state)
 		if (clk_on > 0)
 			return -ENODEV;
 
-		omap2_block_sleep();
 		clk_enable(clk);
 		clk_on = 1;
 	} else {
@@ -67,7 +66,6 @@ static int musb_set_clock(struct clk *clk, int state)
 
 		clk_disable(clk);
 		clk_on = 0;
-		omap2_allow_sleep();
 	}
 
 	return 0;