From 71ab7583ab0dbbf4a5617837ad7d8858109fb222 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 2 Aug 2005 14:55:40 -0700
Subject: [PATCH] --- yaml --- r: 5591 b: refs/heads/master c:
 688d191821de7893043f5a37970472627aaffa4e h: refs/heads/master i:   5589:
 18e848591c2f216a51112f4ee9e9ea6a1f817e77   5587:
 31ee2af18c57752e4816bcbbfad24f1ceb8cb868   5583:
 56bcc2bdba6eb64a16188704e0857474f52c4519 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/pci/bus.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 36e0ddf996da..0db6d012a9ca 100644
--- 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
index fedae89d8f7d..fb9a11243d2a 100644
--- 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;