Merge tag 'v3.10.99' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / resource.c

diff --git a/kernel/resource.c b/kernel/resource.c
index ffda5adb71c5c05cd877a4d1c631157edfad1d40..df80479b397cf6655df91593b3d801e3218c4eee 100644 (file)
--- 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);