patch-2.4.0-test6 linux/drivers/ide/ide-features.c

• Lines: 21
• Date: Thu Aug 3 16:07:42 2000
• Orig file: v2.4.0-test5/linux/drivers/ide/ide-features.c
• Orig date: Thu Jul 27 17:38:00 2000

diff -u --recursive --new-file v2.4.0-test5/linux/drivers/ide/ide-features.c linux/drivers/ide/ide-features.c
@@ -164,10 +164,8 @@
 	 * change (copied from ide-probe.c)
 	 */
 	struct hd_driveid *id;
-	unsigned long timeout, irqs, flags;
+	unsigned long timeout, flags;
 
-	probe_irq_off(probe_irq_on());
-	irqs = probe_irq_on();
 	SELECT_MASK(HWIF(drive), drive, 1);
 	if (IDE_CONTROL_REG)
 		OUT_BYTE(drive->ctl,IDE_CONTROL_REG);
@@ -176,8 +174,6 @@
 	timeout = jiffies + WAIT_WORSTCASE;
 	do {
 		if (0 < (signed long)(jiffies - timeout)) {
-			if (irqs)
-				(void) probe_irq_off(irqs);
 			SELECT_MASK(HWIF(drive), drive, 0);
 			return 0;	/* drive timed-out */
 		}