---

yaml --- r: 174785 b: refs/heads/master c: 8c8def2 h: refs/heads/master i: 174783: 0b21ed3 v: v3
git-mirror · Nov 11, 2009 · adac595 · adac595
1 parent 85c0f67
commit adac595
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9d1e4921d5b62a80ed02851639249e2548d24f1
+refs/heads/master: 8c8def26bfaa704db67d515da3eb92cf26067548
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
@@ -382,8 +382,12 @@ pci_find_parent_resource(const struct pci_dev *dev, struct resource *res)
 			continue;	/* Wrong type */
 		if (!((res->flags ^ r->flags) & IORESOURCE_PREFETCH))
 			return r;	/* Exact match */
-		if ((res->flags & IORESOURCE_PREFETCH) && !(r->flags & IORESOURCE_PREFETCH))
-			best = r;	/* Approximating prefetchable by non-prefetchable */
+		/* We can't insert a non-prefetch resource inside a prefetchable parent .. */
+		if (r->flags & IORESOURCE_PREFETCH)
+			continue;
+		/* .. but we can put a prefetchable resource inside a non-prefetchable one */
+		if (!best)
+			best = r;
 	}
 	return best;
 }