projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sched: Add group_misfit_task load-balance type
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
resource.c
diff --git
a/kernel/resource.c
b/kernel/resource.c
index f150dbbe6f62d31aa07b3fbf3f07a8807fa40991..249b1eb1e6e1381c6963296db8c408f99a01b3b5 100644
(file)
--- 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) {
if (!conflict)
break;
if (conflict != parent) {
- parent = conflict;
- if (!(conflict->flags & IORESOURCE_BUSY))
+ if (!(conflict->flags & IORESOURCE_BUSY)) {
+ parent = conflict;
continue;
continue;
+ }
}
if (conflict->flags & flags & IORESOURCE_MUXED) {
add_wait_queue(&muxed_resource_wait, &wait);
}
if (conflict->flags & flags & IORESOURCE_MUXED) {
add_wait_queue(&muxed_resource_wait, &wait);