1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index a55e68f2cfc8..09d05ab262be 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -140,12 +140,14 @@ int cpuidle_idle_call(void)
                 return 0;
         }
 
-        trace_cpu_idle_rcuidle(next_state, dev->cpu);
-
         broadcast = !!(drv->states[next_state].flags & CPUIDLE_FLAG_TIMER_STOP);
 
-        if (broadcast)
-                clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu);
+        if (broadcast &&
+            clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu))
+                return -EBUSY;
+
+
+        trace_cpu_idle_rcuidle(next_state, dev->cpu);
 
         if (cpuidle_state_is_coupled(dev, drv, next_state))
                 entered_state = cpuidle_enter_state_coupled(dev, drv,
@@ -153,11 +155,11 @@ int cpuidle_idle_call(void)
         else
                 entered_state = cpuidle_enter_state(dev, drv, next_state);
 
+        trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
+
         if (broadcast)
                 clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);
 
-        trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
-
         /* give the governor an opportunity to reflect on the outcome */
         if (cpuidle_curr_governor->reflect)
                 cpuidle_curr_governor->reflect(dev, entered_state);