Merge tag 'v4.5-rc6' into core/resources, to resolve conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/kernel/resource.c b/kernel/resource.c
index 49834309043c..4d466052426b 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -1098,9 +1098,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);