Merge back earlier cpuidle material for 3.19-rc1.

[deliverable/linux.git] / drivers / cpuidle / dt_idle_states.c

diff --git a/drivers/cpuidle/dt_idle_states.c b/drivers/cpuidle/dt_idle_states.c
index 5301912cb84ed615a6a50ce50f4ea7a3aefb2494..a5c111b67f377e2a1b8e008c9fa09a92bfcea051 100644 (file)
--- a/drivers/cpuidle/dt_idle_states.c
+++ b/drivers/cpuidle/dt_idle_states.c
@@ -78,7 +78,7 @@ static int init_state_node(struct cpuidle_state *idle_state,
        if (err)
                desc = state_node->name;
 
-       idle_state->flags = CPUIDLE_FLAG_TIME_VALID;
+       idle_state->flags = 0;
        if (of_property_read_bool(state_node, "local-timer-stop"))
                idle_state->flags |= CPUIDLE_FLAG_TIMER_STOP;
        /*