1 files changed, 2 insertions, 3 deletions

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index 07dfa7fdd2a0..240b0cbfb532 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -2410,9 +2410,8 @@ bed:
 
                         /* Set watchdog timer to expire in <val> ms. */
                         self->errno = 0;
-                        init_timer(&self->watchdog);
-                        self->watchdog.function = irda_discovery_timeout;
-                        self->watchdog.data = (unsigned long) self;
+                        setup_timer(&self->watchdog, irda_discovery_timeout,
+                                        (unsigned long)self);
                         self->watchdog.expires = jiffies + (val * HZ/1000);
                         add_timer(&(self->watchdog));