Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[deliverable/linux.git] / drivers / tty / metag_da.c

diff --git a/drivers/tty/metag_da.c b/drivers/tty/metag_da.c
index 9325262289f9e191a1c3ecb5d8024df56b7e0d21..25ccef2fe748b5c753ca40da356cc6441e5e2a77 100644 (file)
--- a/drivers/tty/metag_da.c
+++ b/drivers/tty/metag_da.c
@@ -323,12 +323,12 @@ static void dashtty_timer(unsigned long ignored)
        if (channel >= 0)
                fetch_data(channel);
 
-       mod_timer_pinned(&poll_timer, jiffies + DA_TTY_POLL);
+       mod_timer(&poll_timer, jiffies + DA_TTY_POLL);
 }
 
 static void add_poll_timer(struct timer_list *poll_timer)
 {
-       setup_timer(poll_timer, dashtty_timer, 0);
+       setup_pinned_timer(poll_timer, dashtty_timer, 0);
        poll_timer->expires = jiffies + DA_TTY_POLL;
 
        /*