1 files changed, 2 insertions, 0 deletions

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index b66365b6ba77..1bf9307e8f56 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -3594,6 +3594,8 @@ retry:
                         spin_lock_irq(cfqd->queue->queue_lock);
                         if (new_cfqq)
                                 goto retry;
+                        else
+                                return &cfqd->oom_cfqq;
                 } else {
                         cfqq = kmem_cache_alloc_node(cfq_pool,
                                         gfp_mask | __GFP_ZERO,