patch-2.3.16 linux/drivers/block/sl82c105.c

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

diff -u --recursive --new-file v2.3.15/linux/drivers/block/sl82c105.c linux/drivers/block/sl82c105.c
@@ -68,7 +68,8 @@
 		 * the correct drive has been selected.
 		 */
 		SELECT_DRIVE(hwif, drive);
-		OUT_BYTE(drive->ctl | 2, IDE_CONTROL_REG);
+		if (IDE_CONTROL_REG)
+			OUT_BYTE(drive->ctl | 2, IDE_CONTROL_REG);
 		OUT_BYTE(0x08 | pio,  IDE_NSECTOR_REG);
 		OUT_BYTE(0x03, IDE_FEATURE_REG);
 		OUT_BYTE(WIN_SETFEATURES, IDE_COMMAND_REG);
@@ -79,8 +80,8 @@
 			       drive->name);
 			return 1;
 		}
-
-		OUT_BYTE(drive->ctl, IDE_CONTROL_REG);
+		if (IDE_CONTROL_REG)
+			OUT_BYTE(drive->ctl, IDE_CONTROL_REG);
 	}
 
 	return 0;

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