From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> Rename the "out" label in acpi_scan_init() to "unlock", which is a better match for its purpose, and fix up the alignment. No functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> --- drivers/acpi/scan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: linux-pm/drivers/acpi/scan.c =================================================================== --- linux-pm.orig/drivers/acpi/scan.c +++ linux-pm/drivers/acpi/scan.c @@ -2556,11 +2556,11 @@ void __init acpi_scan_init(void) * Enumerate devices in the ACPI namespace. */ if (acpi_bus_scan(ACPI_ROOT_OBJECT)) - goto out; + goto unlock; acpi_root = acpi_fetch_acpi_dev(ACPI_ROOT_OBJECT); if (!acpi_root) - goto out; + goto unlock; /* Fixed feature devices do not exist on HW-reduced platform */ if (!acpi_gbl_reduced_hardware) @@ -2570,7 +2570,7 @@ void __init acpi_scan_init(void) acpi_scan_initialized = true; - out: +unlock: mutex_unlock(&acpi_scan_lock); }