2012-05-11 16:33:32

by Andi Kleen

Subject: [PATCH] ata_generic: Skip is_intel_ider() check when ata_generic=1 is set

From: Andi Kleen <[email protected]>

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: [email protected]
Signed-off-by: Andi Kleen <[email protected]>
---
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

2012-05-11 16:41:31

by Alan

Subject: Re: [PATCH] ata_generic: Skip is_intel_ider() check when ata_generic=1 is set

On Fri, 11 May 2012 09:33:23 -0700
Andi Kleen <[email protected]> wrote:

> From: Andi Kleen <[email protected]>
>
> 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: [email protected]
> Signed-off-by: Andi Kleen <[email protected]>

Acked-by: Alan Cox <[email protected]>

2012-05-22 20:04:55

by Jeff Garzik

Subject: Re: [PATCH] ata_generic: Skip is_intel_ider() check when ata_generic=1 is set

On 05/11/2012 12:33 PM, Andi Kleen wrote:
> From: Andi Kleen<[email protected]>
>
> 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: [email protected]
> Signed-off-by: Andi Kleen<[email protected]>
> ---
> drivers/ata/ata_generic.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

applied