On Thu, Jun 26, 2008 at 04:38:38PM +0300, Tony Lindgren wrote:
> Did you mean to remove omap2_allow_sleep() instead of clk_disable()?

Crap... yeah.. sorry, attached is new patch.

-- 
        - Balbi
>From d096d1c215e4c519d77ba27035ea4c57fb793362 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <[EMAIL PROTECTED]>
Date: Thu, 26 Jun 2008 16:31:44 +0300
Subject: [PATCH] ARCH: OMAP: MUSB: Do not block sleep
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Do not block sleep while musb clock is enabled
as it completely blocks dynamic sleep.

Thanks to Jouni Högander.

Signed-off-by: Felipe Balbi <[EMAIL PROTECTED]>
Signed-off-by: Jouni Högander <[EMAIL PROTECTED]>
---
 arch/arm/mach-omap2/usb-musb.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index cbd59f8..bd3556b 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;
-- 
1.5.6.49.g112db

Reply via email to