--- linux-2.4.20-pre4-ac/drivers/ide/pci/amd74xx.c Fri Feb 28 17:05:25 2003 +++ linux-2.4.20-pre4-amd8111/drivers/ide/pci/amd74xx.c Fri Feb 28 17:19:37 2003 @@ -1,5 +1,5 @@ /* - * Version 2.9 + * Version 2.10 * * AMD 755/756/766/8111 and nVidia nForce IDE driver for Linux. * @@ -103,7 +103,7 @@ amd_print("----------AMD BusMastering IDE Configuration----------------"); - amd_print("Driver Version: 2.9"); + amd_print("Driver Version: 2.10"); amd_print("South Bridge: %s", bmide_dev->name); pci_read_config_byte(dev, PCI_REVISION_ID, &t); @@ -309,7 +309,8 @@ case AMD_UDMA_100: pci_read_config_byte(dev, AMD_CABLE_DETECT, &t); - amd_80w = ((u & 0x3) ? 1 : 0) | ((u & 0xc) ? 2 : 0); + pci_read_config_dword(dev, AMD_UDMA_TIMING, &u); + amd_80w = ((t & 0x3) ? 1 : 0) | ((t & 0xc) ? 2 : 0); for (i = 24; i >= 0; i -= 8) if (((u >> i) & 4) && !(amd_80w & (1 << (1 - (i >> 4))))) { printk(KERN_WARNING "AMD_IDE: Bios didn't set cable bits corectly. Enabling workaround.\n");