Merge 3.15-rc3 into staging-next

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index a43220c2e3d9..4d140bbbe100 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -750,9 +750,10 @@ void intel_idle_state_table_update(void)
                         if (package_num + 1 > num_sockets) {
                                 num_sockets = package_num + 1;
 
-                                if (num_sockets > 4)
+                                if (num_sockets > 4) {
                                         cpuidle_state_table = ivt_cstates_8s;
                                         return;
+                                }
                         }
                 }