diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-05-11 09:33:23 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-05-22 15:54:13 -0400 |
| commit | 47ee9108c1dcca434f479e9e520789d2a2ab7917 (patch) | |
| tree | bc2c32d7168e8096dce3d75012aec75ee88337ff /drivers/ata | |
| parent | 8d899e70c1b3afff04104eebc09a629ac8dd4b32 (diff) | |
| download | linux-stable-47ee9108c1dcca434f479e9e520789d2a2ab7917.tar.gz linux-stable-47ee9108c1dcca434f479e9e520789d2a2ab7917.tar.bz2 linux-stable-47ee9108c1dcca434f479e9e520789d2a2ab7917.zip | |
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>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | 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 7df56ec31819..aae115600b74 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; |