patch-2.3.18 linux/drivers/atm/zatm.c

• Lines: 28
• Date: Wed Sep 8 11:14:32 1999
• Orig file: v2.3.17/linux/drivers/atm/zatm.c
• Orig date: Tue Aug 31 17:29:13 1999

diff -u --recursive --new-file v2.3.17/linux/drivers/atm/zatm.c linux/drivers/atm/zatm.c
@@ -347,7 +347,7 @@
 
 #ifdef CONFIG_ATM_ZATM_EXACT_TS
 
-static struct timer_list sync_timer = { NULL, NULL, 0L, 0L, NULL };
+static struct timer_list sync_timer;
 
 
 /*
@@ -454,9 +454,7 @@
 		zatm_dev->last_real_time = now;
 		zatm_dev->last_clk = ticks;
 	}
-	del_timer(&sync_timer);
-	sync_timer.expires += POLL_INTERVAL*HZ;
-	add_timer(&sync_timer);
+	mod_timer(&sync_timer,sync_timer.expires+POLL_INTERVAL*HZ);
 }
 
 
@@ -475,6 +473,7 @@
 	zatm_dev->last_clk = zpeekl(zatm_dev,uPD98401_TSR);
 	if (start_timer) {
 		start_timer = 0;
+		init_timer(&sync_timer);
 		sync_timer.expires = jiffies+POLL_INTERVAL*HZ;
 		sync_timer.function = zatm_clock_sync;
 		add_timer(&sync_timer);