diff --git a/[refs] b/[refs]
index a1b80f1af44c..79df01d011a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1458187ae66825871c93b6b56ca2cd1d88e9cb9
+refs/heads/master: e4f5224464739a89e6a6c9169211ef4f76165056
diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c
index 586e7e993d3d..4d31748faca3 100644
--- a/trunk/drivers/acpi/osl.c
+++ b/trunk/drivers/acpi/osl.c
@@ -1555,7 +1555,7 @@ int acpi_check_resource_conflict(const struct resource *res)
 	else
 		space_id = ACPI_ADR_SPACE_SYSTEM_MEMORY;
 
-	length = res->end - res->start + 1;
+	length = resource_size(res);
 	if (acpi_enforce_resources != ENFORCE_RESOURCES_NO)
 		warn = 1;
 	clash = acpi_check_address_range(space_id, res->start, length, warn);