ACPICA: Hardware: back port of a recursive locking fix

This patch is a back port result of the following Linux commit:
 Commit: f7f71cfbf0c276ee3d8d856d0f35a41aed997fa4
 Author: Rakib Mullick <rakib.mullick@gmail.com>
 Subject: ACPI: Fix possible recursive locking in hwregs.c

As a result of different coding style rules, the back ported code generates
source code differences between the Linux kernel and the ACPICA upstream.
This patch reduces such source code differences.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index e0fd9b4978cd6a22af964a3165d26cfd62ea032f..a4c34d2c556b24d14f4954d3afe516a39f9b10d9 100644 (file)
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -278,8 +278,9 @@ acpi_status acpi_hw_clear_acpi_status(void)
 
        acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
 
-       if (ACPI_FAILURE(status))
+       if (ACPI_FAILURE(status)) {
                goto exit;
+       }
 
        /* Clear the GPE Bits in all GPE registers in all GPE blocks */