patch-2.3.34 linux/drivers/block/sis5513.c
Next file: linux/drivers/block/sl82c105.c
Previous file: linux/drivers/block/q40ide.c
Back to the patch index
Back to the overall index
- Lines: 25
- Date:
Tue Dec 14 23:03:50 1999
- Orig file:
v2.3.33/linux/drivers/block/sis5513.c
- Orig date:
Tue Nov 23 22:42:20 1999
diff -u --recursive --new-file v2.3.33/linux/drivers/block/sis5513.c linux/drivers/block/sis5513.c
@@ -1,5 +1,5 @@
/*
- * linux/drivers/block/sis5513.c Version 0.07 Sept. 3, 1999
+ * linux/drivers/block/sis5513.c Version 0.08 Dec. 13, 1999
*
* Copyright (C) 1999 Andre Hedrick (andre@suse.com)
* May be copied or modified under the terms of the GNU General Public License
@@ -266,15 +266,13 @@
pci_read_config_byte(dev, drive_pci|0x01, &test2);
}
- if ((id->dma_ultra & 0x0010) && (ultra) &&
- (udma_66) && (four_two)) {
+ if ((id->dma_ultra & 0x0010) && (ultra) && (udma_66) && (four_two)) {
if (!(test2 & 0x90)) {
pci_write_config_byte(dev, drive_pci|0x01, test2 & ~unmask);
pci_write_config_byte(dev, drive_pci|0x01, test2|0x90);
}
speed = XFER_UDMA_4;
- } else if ((id->dma_ultra & 0x0008) && (ultra) &&
- (udma_66) && (four_two)) {
+ } else if ((id->dma_ultra & 0x0008) && (ultra) && (udma_66) && (four_two)) {
if (!(test2 & 0xA0)) {
pci_write_config_byte(dev, drive_pci|0x01, test2 & ~unmask);
pci_write_config_byte(dev, drive_pci|0x01, test2|0xA0);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)