[PATCH] pata_ali: small fixes

[PATCH] pata_ali: small fixes

[Alan]

Switch to pci_get_bus_and_slot because some x86 systems seem to be
handing us a device with dev->bus = NULL. Also don't apply the isa fixup
to revision C6 and later of the chip. 

Really we need to work out wtf is handing us pdev->bus = NULL, but firstly
and more importantly we need the drivers working.

Signed-off-by: Alan Cox <alan@redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc6-mm1/drivers/ata/pata_ali.c linux-2.6.19-rc6-mm1/drivers/ata/pata_ali.c
--- linux.vanilla-2.6.19-rc6-mm1/drivers/ata/pata_ali.c	2006-11-24 13:58:28.000000000 +0000
+++ linux-2.6.19-rc6-mm1/drivers/ata/pata_ali.c	2006-12-01 21:22:19.000000000 +0000
@@ -34,7 +34,7 @@
 #include <linux/dmi.h>
 
 #define DRV_NAME "pata_ali"
-#define DRV_VERSION "0.7.1"
+#define DRV_VERSION "0.7.2"
 
 /*
  *	Cable special cases
@@ -530,7 +530,7 @@
 		pci_read_config_byte(pdev, 0x4B, &tmp);
 		pci_write_config_byte(pdev, 0x4B, tmp | 0x08);
 	}
-	north = pci_get_slot(pdev->bus, PCI_DEVFN(0,0));
+	north = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
 	isa_bridge = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
 
 	if (north && north->vendor == PCI_VENDOR_ID_AL && isa_bridge) {
@@ -539,7 +539,7 @@
 		pci_read_config_byte(isa_bridge, 0x79, &tmp);
 		if (rev == 0xC2)
 			pci_write_config_byte(isa_bridge, 0x79, tmp | 0x04);
-		else if (rev > 0xC2)
+		else if (rev > 0xC2 && rev < 0xC5)
 			pci_write_config_byte(isa_bridge, 0x79, tmp | 0x02);
 	}
 	if (rev >= 0x20) {

Re: [PATCH] pata_ali: small fixes

[Jeff Garzik]

Alan wrote:
> Switch to pci_get_bus_and_slot because some x86 systems seem to be
> handing us a device with dev->bus = NULL. Also don't apply the isa fixup
> to revision C6 and later of the chip. 
> 
> Really we need to work out wtf is handing us pdev->bus = NULL, but firstly
> and more importantly we need the drivers working.
> 
> Signed-off-by: Alan Cox <alan@redhat.com>

applied