git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'hda-switcheroo' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[pandora-kernel.git]
/
drivers
/
ata
/
ata_generic.c
diff --git
a/drivers/ata/ata_generic.c
b/drivers/ata/ata_generic.c
index
7df56ec
..
aae1156
100644
(file)
--- 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;