patch-2.1.102 linux/drivers/block/ide.c

• Lines: 16
• Date: Sat May 9 11:54:19 1998
• Orig file: v2.1.101/linux/drivers/block/ide.c
• Orig date: Fri May 8 23:14:47 1998

diff -u --recursive --new-file v2.1.101/linux/drivers/block/ide.c linux/drivers/block/ide.c
@@ -1333,6 +1333,7 @@
 	}
 	hwgroup->busy = 1;	/* should already be "1" */
 	hwgroup->handler = NULL;
+	del_timer(&hwgroup->timer);
 	if (hwgroup->poll_timeout != 0) {	/* polling in progress? */
 		IDE_SPIN_UNLOCK_IRQRESTORE("ide_timer_expiry3", &hwgroup->spinlock, flags);
 		handler(drive);
@@ -1348,7 +1349,6 @@
 		IDE_SPIN_UNLOCK_IRQRESTORE("ide_timer_expiry5", &hwgroup->spinlock, flags);
 		ide_error(drive, "irq timeout", GET_STAT());
 	}
-	del_timer(&hwgroup->timer);
 	start_next_request(hwgroup, 0);
 }