From 5420bf6eb647df7bbb4fa68544de3794f6e7af80 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 8 Oct 2010 10:23:32 -0700 Subject: [PATCH] --- yaml --- r: 216995 b: refs/heads/master c: 503923eeecb93ff69ee940549f314e0fe3a68429 h: refs/heads/master i: 216993: 692965b93a110e49bdfe24511d5157cbec161289 216991: 8ca13eb970c2c084365369057b5e3ff4ea563bfb v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/pm24xx.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1b3f0e0e9539..621ba32142a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc7a1d2a540a780066aa562c651a88dd28b6fc8a +refs/heads/master: 503923eeecb93ff69ee940549f314e0fe3a68429 diff --git a/trunk/arch/arm/mach-omap2/pm24xx.c b/trunk/arch/arm/mach-omap2/pm24xx.c index 6aeedeacdad8..f5c7ef955942 100644 --- a/trunk/arch/arm/mach-omap2/pm24xx.c +++ b/trunk/arch/arm/mach-omap2/pm24xx.c @@ -245,6 +245,8 @@ static int omap2_can_sleep(void) { if (omap2_fclks_active()) return 0; + if (!omap_uart_can_sleep()) + return 0; if (osc_ck->usecount > 1) return 0; if (omap_dma_running())