diff options
Diffstat (limited to 'kernel/resource.c')
-rw-r--r-- | kernel/resource.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index 92190f62ebc5..8c15f846e8ef 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
@@ -520,21 +520,20 @@ EXPORT_SYMBOL_GPL(page_is_ram); | |||
520 | int region_intersects(resource_size_t start, size_t size, unsigned long flags, | 520 | int region_intersects(resource_size_t start, size_t size, unsigned long flags, |
521 | unsigned long desc) | 521 | unsigned long desc) |
522 | { | 522 | { |
523 | resource_size_t end = start + size - 1; | 523 | struct resource res; |
524 | int type = 0; int other = 0; | 524 | int type = 0; int other = 0; |
525 | struct resource *p; | 525 | struct resource *p; |
526 | 526 | ||
527 | res.start = start; | ||
528 | res.end = start + size - 1; | ||
529 | |||
527 | read_lock(&resource_lock); | 530 | read_lock(&resource_lock); |
528 | for (p = iomem_resource.child; p ; p = p->sibling) { | 531 | for (p = iomem_resource.child; p ; p = p->sibling) { |
529 | bool is_type = (((p->flags & flags) == flags) && | 532 | bool is_type = (((p->flags & flags) == flags) && |
530 | ((desc == IORES_DESC_NONE) || | 533 | ((desc == IORES_DESC_NONE) || |
531 | (desc == p->desc))); | 534 | (desc == p->desc))); |
532 | 535 | ||
533 | if (start >= p->start && start <= p->end) | 536 | if (resource_overlaps(p, &res)) |
534 | is_type ? type++ : other++; | ||
535 | if (end >= p->start && end <= p->end) | ||
536 | is_type ? type++ : other++; | ||
537 | if (p->start >= start && p->end <= end) | ||
538 | is_type ? type++ : other++; | 537 | is_type ? type++ : other++; |
539 | } | 538 | } |
540 | read_unlock(&resource_lock); | 539 | read_unlock(&resource_lock); |