From fdfde209ab0324f2b12030f76db91abde49f4284 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Fri, 11 May 2012 09:33:23 -0700 Subject: [PATCH] --- yaml --- r: 305871 b: refs/heads/master c: 47ee9108c1dcca434f479e9e520789d2a2ab7917 h: refs/heads/master i: 305869: c81f8c466704748a409cf8c0fa5633155c7a8c8f 305867: ab1568293725ea3dc20e64f77018f94abd6163f6 305863: bef0254e401387f3a82b33361a009881849e620a 305855: 9128122ccb9a5302815a4254e28b1d661c93d3b6 v: v3 --- [refs] | 2 +- trunk/drivers/ata/ata_generic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d2fbd324f1bc..2217248ec104 100644 --- 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 index 7df56ec31819..aae115600b74 100644 --- 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;