---

yaml --- r: 305871 b: refs/heads/master c: 47ee910 h: refs/heads/master i: 305869: c81f8c4 305867: ab15682 305863: bef0254 305855: 9128122 v: v3
git-mirror · May 22, 2012 · fdfde20 · fdfde20
1 parent 3bc7820
commit fdfde20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d899e70c1b3afff04104eebc09a629ac8dd4b32
+refs/heads/master: 47ee9108c1dcca434f479e9e520789d2a2ab7917
diff --git a/trunk/drivers/ata/ata_generic.c b/trunk/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;