From 4f4affc36b3260af7edaab32adfb6f695cc61b12 Mon Sep 17 00:00:00 2001 From: Vaibhav Bedia Date: Sun, 10 Jul 2011 05:56:53 -0600 Subject: [PATCH] --- yaml --- r: 260669 b: refs/heads/master c: a5122ff8ceb2b1f207965a3608d3da3af832e513 h: refs/heads/master i: 260667: e6675a8f75c3eeb3ee6012e0ad9245c7a74688af v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/clockdomain.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index de95d4fa0275..caf4ae332b43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45c38252d76a96e6e0e05f982ca44096191a8eea +refs/heads/master: a5122ff8ceb2b1f207965a3608d3da3af832e513 diff --git a/trunk/arch/arm/mach-omap2/clockdomain.c b/trunk/arch/arm/mach-omap2/clockdomain.c index 6cb6c03293df..4fbbbfcc9ba2 100644 --- a/trunk/arch/arm/mach-omap2/clockdomain.c +++ b/trunk/arch/arm/mach-omap2/clockdomain.c @@ -834,7 +834,6 @@ int clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk) clk->name); arch_clkdm->clkdm_clk_enable(clkdm); - pwrdm_wait_transition(clkdm->pwrdm.ptr); pwrdm_clkdm_state_switch(clkdm); return 0;