patch-2.3.99-pre7 linux/drivers/isdn/hisax/fsm.c

• Lines: 18
• Date: Thu May 4 11:20:50 2000
• Orig file: v2.3.99-pre6/linux/drivers/isdn/hisax/fsm.c
• Orig date: Wed Feb 16 17:03:52 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/isdn/hisax/fsm.c linux/drivers/isdn/hisax/fsm.c
@@ -156,7 +156,7 @@
 			(long) ft, millisec, where);
 #endif
 
-	if (ft->tl.next || ft->tl.prev) {
+	if (timer_pending(&ft->tl)) {
 		printk(KERN_WARNING "FsmAddTimer: timer already active!\n");
 		ft->fi->printdebug(ft->fi, "FsmAddTimer already active!");
 		return -1;
@@ -180,7 +180,7 @@
 			(long) ft, millisec, where);
 #endif
 
-	if (ft->tl.next || ft->tl.prev)
+	if (timer_pending(&ft->tl))
 		del_timer(&ft->tl);
 	init_timer(&ft->tl);
 	ft->event = event;