Commit 47ee9108 authored May 11, 2012 by Andi Kleen Committed by Jeff Garzik May 22, 2012

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>

parent 8d899e70

drivers/ata/ata_generic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;