From: Andi Kleen Date: Fri, 11 May 2012 16:33:23 +0000 (-0700) Subject: ata_generic: Skip is_intel_ider() check when ata_generic=1 is set X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=47ee9108c1dcca434f479e9e520789d2a2ab7917;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Jeff Garzik --- diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c index 7df56ec31819..aae115600b74 100644 --- 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;