From patchwork Fri May 11 16:33:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: ata_generic: Skip is_intel_ider() check when ata_generic=1 is set From: Andi Kleen X-Patchwork-Id: 158557 Message-Id: <1336754003-31487-1-git-send-email-andi@firstfloor.org> To: jgarzik@pobox.com Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Kleen , alan@linux.intel.com Date: Fri, 11 May 2012 09:33:23 -0700 From: Andi Kleen 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 Acked-by: Alan Cox --- drivers/ata/ata_generic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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;