timers: Use proper base migration in add_timer_on()

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

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