---

yaml --- r: 5591 b: refs/heads/master c: 688d191 h: refs/heads/master i: 5589: 18e8485 5587: 31ee2af 5583: 56bcc2b v: v3
git-mirror · Aug 2, 2005 · 71ab758 · 71ab758
1 parent e1599e7
commit 71ab758
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7ed538a02c219119adb20f1dccbf0f8015e53f3
+refs/heads/master: 688d191821de7893043f5a37970472627aaffa4e
diff --git a/trunk/drivers/pci/bus.c b/trunk/drivers/pci/bus.c
@@ -60,7 +60,9 @@ pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
 			continue;
 
 		/* Ok, try it out.. */
-		ret = allocate_resource(r, res, size, min, -1, align,
+		ret = allocate_resource(r, res, size,
+					r->start ? : min,
+					-1, align,
 					alignf, alignf_data);
 		if (ret == 0)
 			break;