Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[karo-tx-linux.git] / drivers / ata / ata_generic.c

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;