diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 15:27:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 15:27:39 -0700 |
| commit | 59d0952b43552570e0f1c3ff91ebb16d4caec171 (patch) | |
| tree | 0f953329b6667b64c7758e694fe50b212806cc59 /drivers/ata/ata_generic.c | |
| parent | 1259f6ee15c1603dcae41eb6af5a5f9cf932d4d6 (diff) | |
| parent | 2fff27512600f9ad91335577e485a8552edb0abf (diff) | |
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
Pull libata update from Jeff Garzik:
"Changes, all of them boring and minor:
1) Ugly MSFT Hyper-V workaround in ata_piix
2) Fix a longstanding error recovery delay caused by excessive
re-re-retries, when media errors occur.
3) Minor hw-specific workarounds and quirks
4) New PATA driver for ep93xx"
* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
PATA host controller driver for ep93xx
[libata] Add " 2GB ATA Flash Disk"/"ADMA428M" to DMA blacklist
ata_generic: Skip is_intel_ider() check when ata_generic=1 is set
libata-eh don't waste time retrying media errors (v3)
ata_piix: defer disks to the Hyper-V drivers by default
libata: add a host flag to ignore detected ATA devices
Diffstat (limited to 'drivers/ata/ata_generic.c')
| -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; |