X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=kernel%2Fresource.c;h=3669d1bfc4254213e0e42dacab374624d74cdd5c;hb=eee577232203842b4dcadb7ab477a298479633ed;hp=09c0597840b02dc260c65baafdd1fde0715bcbb4;hpb=f11aec0d7c835c3b83e74e3fd60d2e48a850c857;p=deliverable%2Flinux.git

diff --git a/kernel/resource.c b/kernel/resource.c
index 09c0597840b0..3669d1bfc425 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -1083,9 +1083,10 @@ struct resource * __request_region(struct resource *parent,
 		if (!conflict)
 			break;
 		if (conflict != parent) {
-			parent = conflict;
-			if (!(conflict->flags & IORESOURCE_BUSY))
+			if (!(conflict->flags & IORESOURCE_BUSY)) {
+				parent = conflict;
 				continue;
+			}
 		}
 		if (conflict->flags & flags & IORESOURCE_MUXED) {
 			add_wait_queue(&muxed_resource_wait, &wait);