X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=kernel%2Fresource.c;h=249b1eb1e6e1381c6963296db8c408f99a01b3b5;hb=d9ae12756d61f7532241602161338220647e07df;hp=f150dbbe6f62d31aa07b3fbf3f07a8807fa40991;hpb=978ab6a009e6691375a0b6f8a44ebbb471a64b6d;p=firefly-linux-kernel-4.4.55.git

diff --git a/kernel/resource.c b/kernel/resource.c
index f150dbbe6f62..249b1eb1e6e1 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);