patch-1.3.14 linux/drivers/block/sbpcd.c

Next file: linux/drivers/block/sjcd.c
Previous file: linux/drivers/block/ide.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.13/linux/drivers/block/sbpcd.c linux/drivers/block/sbpcd.c
@@ -757,7 +757,7 @@
 	if (current == task[0]) 
 	{
 		del_timer(&delay_timer);
-		delay_timer.expires=time;
+		delay_timer.expires=jiffies+time;
 		timed_out_delay=0;
 		add_timer(&delay_timer);
 		while (!timed_out_delay) ;
@@ -2945,7 +2945,7 @@
 #if 1
 	del_timer(&delay_timer);
 #endif
-	delay_timer.expires=110;
+	delay_timer.expires=jiffies+110;
 	timed_out_delay=0;
 	add_timer(&delay_timer);
 	msg(DBG_TIM,"delay timer started (110).\n");
@@ -4579,7 +4579,7 @@
 		SBPCD_CLI;
 		
 		del_timer(&data_timer);
-		data_timer.expires=max_latency;
+		data_timer.expires=jiffies+max_latency;
 		timed_out_data=0;
 		add_timer(&data_timer);
 		while (!timed_out_data) 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this