patch-2.3.99-pre7 linux/drivers/ide/ide.c

Next file: linux/drivers/ieee1394/ohci1394.c
Previous file: linux/drivers/ide/ide-tape.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/ide/ide.c linux/drivers/ide/ide.c
@@ -1256,7 +1256,7 @@
 				if (0 < (signed long)(jiffies + WAIT_MIN_SLEEP - sleep)) 
 					sleep = jiffies + WAIT_MIN_SLEEP;
 #if 1
-				if (hwgroup->timer.next || hwgroup->timer.prev)
+				if (timer_pending(&hwgroup->timer))
 					printk("ide_set_handler: timer already active\n");
 #endif
 				hwgroup->sleeping = 1;	/* so that ide_timer_expiry knows what to do */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)