1 files changed, 4 insertions, 0 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 74f3f7825229..ce72d45c7fd8 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -569,6 +569,10 @@ EXPORT_SYMBOL(flush_work_keventd);
 void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq,
                                        struct delayed_work *dwork)
 {
+        /* Was it ever queued ? */
+        if (!get_wq_data(&dwork->work))
+                return;
+
         while (!cancel_delayed_work(dwork))
                 flush_workqueue(wq);
 }