public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ata_generic: Skip is_intel_ider() check when ata_generic=1 is set
@ 2012-05-11 16:33 Andi Kleen
  2012-05-11 16:56 ` Alan Cox
  2012-05-22 20:04 ` Jeff Garzik
  0 siblings, 2 replies; 3+ messages in thread
From: Andi Kleen @ 2012-05-11 16:33 UTC (permalink / raw)
  To: jgarzik; +Cc: linux-ide, linux-kernel, Andi Kleen, alan

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(-)

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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-05-22 20:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-11 16:33 [PATCH] ata_generic: Skip is_intel_ider() check when ata_generic=1 is set Andi Kleen
2012-05-11 16:56 ` Alan Cox
2012-05-22 20:04 ` Jeff Garzik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox