From d0dfb308f00143da29dbb3a3e948771f824ca936 Mon Sep 17 00:00:00 2001 From: Jean Pihet Date: Sat, 26 Jan 2013 00:58:13 -0700 Subject: [PATCH] --- yaml --- r: 355611 b: refs/heads/master c: c165a14023ecec8a68f3b87d0c3c822426065937 h: refs/heads/master i: 355609: 965252b0396b6797f13e386c356219dd888b19ad 355607: 7d96653ad7f84d513a38f605d4dc92a0fa920a3b v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/powerdomain.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 18e6dd654e92..091317738814 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32d174ed1bd793e9be578914cce6b1e45c36843e +refs/heads/master: c165a14023ecec8a68f3b87d0c3c822426065937 diff --git a/trunk/arch/arm/mach-omap2/powerdomain.c b/trunk/arch/arm/mach-omap2/powerdomain.c index dea62a9aad07..92388c04f83d 100644 --- a/trunk/arch/arm/mach-omap2/powerdomain.c +++ b/trunk/arch/arm/mach-omap2/powerdomain.c @@ -143,7 +143,7 @@ static void _update_logic_membank_counters(struct powerdomain *pwrdm) static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag) { - int prev, state, trace_state = 0; + int prev, next, state, trace_state = 0; if (pwrdm == NULL) return -EINVAL; @@ -164,9 +164,10 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag) * If the power domain did not hit the desired state, * generate a trace event with both the desired and hit states */ - if (state != prev) { + next = pwrdm_read_next_pwrst(pwrdm); + if (next != prev) { trace_state = (PWRDM_TRACE_STATES_FLAG | - ((state & OMAP_POWERSTATE_MASK) << 8) | + ((next & OMAP_POWERSTATE_MASK) << 8) | ((prev & OMAP_POWERSTATE_MASK) << 0)); trace_power_domain_target(pwrdm->name, trace_state, smp_processor_id());