diff --git a/[refs] b/[refs]
index fc7468f1be63..666b3df2c8df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15b611f63f0fb8709a5fae498c2d688b5d05edc9
+refs/heads/master: c9594643c095da0a0ad4d5f0a1ff357a84e91524
diff --git a/trunk/drivers/char/sx.c b/trunk/drivers/char/sx.c
index 401ebab26018..0122b2d93312 100644
--- a/trunk/drivers/char/sx.c
+++ b/trunk/drivers/char/sx.c
@@ -1353,10 +1353,7 @@ static void sx_pollfunc(unsigned long data)
 
 	sx_interrupt(0, board);
 
-	init_timer(&board->timer);
-
-	board->timer.expires = jiffies + sx_poll;
-	add_timer(&board->timer);
+	mod_timer(&board->timer, jiffies + sx_poll);
 	func_exit();
 }
 
@@ -2134,14 +2131,10 @@ static int sx_init_board(struct sx_board *board)
 
 		/* The timer should be initialized anyway: That way we can
 		   safely del_timer it when the module is unloaded. */
-		init_timer(&board->timer);
+		setup_timer(&board->timer, sx_pollfunc, (unsigned long)board);
 
-		if (board->poll) {
-			board->timer.data = (unsigned long)board;
-			board->timer.function = sx_pollfunc;
-			board->timer.expires = jiffies + board->poll;
-			add_timer(&board->timer);
-		}
+		if (board->poll)
+			mod_timer(&board->timer, jiffies + board->poll);
 	} else {
 		board->irq = 0;
 	}