patch-2.3.99-pre7 linux/drivers/isdn/sc/timer.c

• Lines: 22
• Date: Fri Apr 28 22:50:13 2000
• Orig file: v2.3.99-pre6/linux/drivers/isdn/sc/timer.c
• Orig date: Thu Feb 27 10:57:30 1997

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/isdn/sc/timer.c linux/drivers/isdn/sc/timer.c
@@ -91,9 +91,7 @@
 	else  {
 		pr_debug("%s: No signature yet, waiting another %d jiffies.\n", 
 			adapter[card]->devicename, CHECKRESET_TIME);
-		del_timer(&adapter[card]->reset_timer);
-		adapter[card]->reset_timer.expires = jiffies + CHECKRESET_TIME;
-		add_timer(&adapter[card]->reset_timer);
+		mod_timer(&adapter[card]->reset_timer, jiffies+CHECKRESET_TIME);
 	}
 	restore_flags(flags);
 		
@@ -138,9 +136,7 @@
 	/* Reinitialize the timer */
 	save_flags(flags);
 	cli();
-	del_timer(&adapter[card]->stat_timer);
-	adapter[card]->stat_timer.expires = jiffies + CHECKSTAT_TIME;
-	add_timer(&adapter[card]->stat_timer);
+	mod_timer(&adapter[card]->stat_timer, jiffies+CHECKSTAT_TIME);
 	restore_flags(flags);
 
 	/* Send a new cePhyStatus message */