diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2014-07-08 10:08:19 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-08 14:22:27 +0200 |
| commit | 7d3e83bdb44ce725970253cbefd5e824efc0aab2 (patch) | |
| tree | 8ce3d4134cf5de647f4bf70dcd238b8a32d4bb01 /drivers/acpi/acpica | |
| parent | ff2389fe662460c71e4ee221cc223b175c231246 (diff) | |
| download | linux-7d3e83bdb44ce725970253cbefd5e824efc0aab2.tar.gz linux-7d3e83bdb44ce725970253cbefd5e824efc0aab2.tar.bz2 linux-7d3e83bdb44ce725970253cbefd5e824efc0aab2.zip | |
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>
Diffstat (limited to 'drivers/acpi/acpica')
| -rw-r--r-- | drivers/acpi/acpica/hwregs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c index e0fd9b4978cd..a4c34d2c556b 100644 --- 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 */ |