[PATCH] Re: 2.5.36 IDE fixes

I'm terribly sorry - I've sent you the wrong diff, it was
some intermediate variant. Actually it added extra breakage to
ide_hwif_configure().

Desired behavior was:

if ctl == base == 0, the device is in "true legacy" mode (as per PCI
spec); use values from the base address registers otherwise.

drivers/ide/setup-pci.c

@@ -421,20 +421,17 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d,
 {
 	unsigned long ctl = 0, base = 0;
 	ide_hwif_t *hwif;
-	
-	if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE)
-	{
-	    	/*  Possibly we should fail if these checks report true */
-	    	ide_pci_check_iomem(dev, d, 2*port);
-	    	ide_pci_check_iomem(dev, d, 2*port+1);
-	 
-		ctl  = pci_resource_start(dev, 2*port+1);
-		base = pci_resource_start(dev, 2*port);
-		if ((ctl && !base) || (base && !ctl)) {
-			printk(KERN_ERR "%s: inconsistent baseregs (BIOS) "
-				"for port %d, skipping\n", d->name, port);
-			return NULL;
-		}
+
+	/*  Possibly we should fail if these checks report true */
+	ide_pci_check_iomem(dev, d, 2*port);
+	ide_pci_check_iomem(dev, d, 2*port+1);
+ 
+	ctl  = pci_resource_start(dev, 2*port+1);
+	base = pci_resource_start(dev, 2*port);
+	if ((ctl && !base) || (base && !ctl)) {
+		printk(KERN_ERR "%s: inconsistent baseregs (BIOS) "
+			"for port %d, skipping\n", d->name, port);
+		return NULL;
 	}
 	if (!ctl)
 	{