[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1336754003-31487-1-git-send-email-andi@firstfloor.org>
Date: Fri, 11 May 2012 09:33:23 -0700
From: Andi Kleen <andi@...stfloor.org>
To: jgarzik@...ox.com
Cc: linux-ide@...r.kernel.org, linux-kernel@...r.kernel.org,
Andi Kleen <ak@...ux.intel.com>, alan@...ux.intel.com
Subject: [PATCH] ata_generic: Skip is_intel_ider() check when ata_generic=1 is set
From: Andi Kleen <ak@...ux.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@...ux.intel.com
Signed-off-by: Andi Kleen <ak@...ux.intel.com>
---
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;
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists