net/irda: Use barrier to set task state

[firefly-linux-kernel-4.4.55.git] / net / irda / af_irda.c

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index b833677d83d6293724ba2d9948b37c9dbf472694..d07e3a626446b3cab44e68b019f7870619699f75 100644 (file)
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -2567,8 +2567,7 @@ bed:
                                                   err);
 
                        /* If watchdog is still activated, kill it! */
-                       if(timer_pending(&(self->watchdog)))
-                               del_timer(&(self->watchdog));
+                       del_timer(&(self->watchdog));
 
                        IRDA_DEBUG(1, "%s(), ...waking up !\n", __func__);