| Message ID | 1336754003-31487-1-git-send-email-andi@firstfloor.org |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 11 May 2012 09:33:23 -0700 Andi Kleen <andi@firstfloor.org> wrote: > From: Andi Kleen <ak@linux.intel.com> > > 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> Acked-by: Alan Cox <alan@linux.intel.com> -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05/11/2012 12:33 PM, Andi Kleen wrote: > From: Andi Kleen<ak@linux.intel.com> > > 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> > --- > drivers/ata/ata_generic.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) applied -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c index 7df56ec..aae1156 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;