X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=blobdiff_plain;f=kernel%2Fresource.c;h=df80479b397cf6655df91593b3d801e3218c4eee;hp=ffda5adb71c5c05cd877a4d1c631157edfad1d40;hb=HEAD;hpb=81575b8770b65620df25508dc6696b7332838084

diff --git a/kernel/resource.c b/kernel/resource.c
index ffda5adb71c5..df80479b397c 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -961,9 +961,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);