aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/irda/net/ircomm/ircomm_tty.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/irda/net/ircomm/ircomm_tty.c')
-rw-r--r--drivers/staging/irda/net/ircomm/ircomm_tty.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/irda/net/ircomm/ircomm_tty.c b/drivers/staging/irda/net/ircomm/ircomm_tty.c
index ec157c3419b5..473abfaffe7b 100644
--- a/drivers/staging/irda/net/ircomm/ircomm_tty.c
+++ b/drivers/staging/irda/net/ircomm/ircomm_tty.c
@@ -395,7 +395,7 @@ static int ircomm_tty_install(struct tty_driver *driver, struct tty_struct *tty)
self->max_data_size = IRCOMM_TTY_DATA_UNINITIALISED;
/* Init some important stuff */
- init_timer(&self->watchdog_timer);
+ timer_setup(&self->watchdog_timer, NULL, 0);
spin_lock_init(&self->spinlock);
/*