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

Next file: linux/drivers/ide/ide-pci.c
Previous file: linux/drivers/ide/ide-dma.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/ide/ide-features.c linux/drivers/ide/ide-features.c
@@ -39,8 +39,6 @@
 #include <asm/io.h>
 #include <asm/bitops.h>
 
-#define SETFEATURES_CONTROL_REG		(0)	/* some arch's may need */
-
 /*
  * A Verbose noise maker for debugging on the attempted transfer rates.
  */
@@ -310,7 +308,7 @@
 	OUT_BYTE(speed, IDE_NSECTOR_REG);
 	OUT_BYTE(SETFEATURES_XFER, IDE_FEATURE_REG);
 	OUT_BYTE(WIN_SETFEATURES, IDE_COMMAND_REG);
-	if ((IDE_CONTROL_REG) && (SETFEATURES_CONTROL_REG))
+	if ((IDE_CONTROL_REG) && (drive->quirk_list == 2))
 		OUT_BYTE(drive->ctl, IDE_CONTROL_REG);
 	udelay(1);
 	/*

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