1 files changed, 4 insertions, 1 deletions

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index eb4086f7dfe..8830569542c 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1839,6 +1839,9 @@ static bool cfq_should_idle(struct cfq_data *cfqd, struct cfq_queue *cfqq)
         BUG_ON(!service_tree);
         BUG_ON(!service_tree->count);
 
+        if (!cfqd->cfq_slice_idle)
+                return false;
+
         /* We never do for idle class queues. */
         if (prio == IDLE_WORKLOAD)
                 return false;
@@ -1879,7 +1882,7 @@ static void cfq_arm_slice_timer(struct cfq_data *cfqd)
         /*
          * idle is disabled, either manually or by past process history
          */
-        if (!cfqd->cfq_slice_idle || !cfq_should_idle(cfqd, cfqq))
+        if (!cfq_should_idle(cfqd, cfqq))
                 return;
 
         /*