diff --git a/kernel/resource.c b/kernel/resource.c index 3ae2f56cc79d..82df80417489 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -557,13 +557,13 @@ int region_intersects(resource_size_t start, size_t size, unsigned long flags, } read_unlock(&resource_lock); + if (type == 0) + return REGION_DISJOINT; + if (other == 0) - return type ? REGION_INTERSECTS : REGION_DISJOINT; + return REGION_INTERSECTS; - if (type) - return REGION_MIXED; - - return REGION_DISJOINT; + return REGION_MIXED; } EXPORT_SYMBOL_GPL(region_intersects);