ata_generic: Skip is_intel_ider() check when ata_generic=1 is set

When ata_generic_ide=1 is set don't do the is_intel_ider() magic
check. We found at least one box who needed that.

Cc: alan@linux.intel.com
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 7df56ec318193015282cf200e3e4ba9cc6658a12..aae115600b7435ba3944fc7a0fff5f3bdae43037 100644 (file)
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -177,7 +177,7 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id
        if ((id->driver_data & ATA_GEN_CLASS_MATCH) && all_generic_ide == 0)
                return -ENODEV;
 
-       if (id->driver_data & ATA_GEN_INTEL_IDER)
+       if ((id->driver_data & ATA_GEN_INTEL_IDER) && !all_generic_ide)
                if (!is_intel_ider(dev))
                        return -ENODEV;