]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ARCH: OMAP: MUSB: Do not block sleep
authorFelipe Balbi <felipe.balbi@nokia.com>
Fri, 15 Aug 2008 07:49:41 +0000 (10:49 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 18 Aug 2008 13:23:02 +0000 (16:23 +0300)
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>
arch/arm/mach-omap2/usb-musb.c

index 71ddf55aee38f9f15c2abc65f7a8bb0d2e5db9e8..3f90a933ab2af446f81f6d10dac4ede2757707c7 100644 (file)
@@ -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;