summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpi_dbg.c
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2016-07-05 13:18:07 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-07-05 23:02:34 +0200
commit7e3fd813717693597daaa95dee875f4cb2d911ef (patch)
tree6b95cc6bfb19ad76777360494c4ea6d92b010ea6 /drivers/acpi/acpi_dbg.c
parentLinux 4.7-rc6 (diff)
downloadlinux-7e3fd813717693597daaa95dee875f4cb2d911ef.tar.xz
linux-7e3fd813717693597daaa95dee875f4cb2d911ef.zip
ACPI / debugger: Fix regression introduced by IS_ERR_VALUE() removal
The FIFO unlocking mechanism in acpi_dbg has been broken by the following commit: Commit: 287980e49ffc0f6d911601e7e352a812ed27768e Subject: remove lots of IS_ERR_VALUE abuses It converted !IS_ERR_VALUE(ret) into !ret which was not entirely correct. Fix the regression by taking ret > 0 into account too as appropriate. Fixes: 287980e49ffc (remove lots of IS_ERR_VALUE abuses) Signed-off-by: Lv Zheng <lv.zheng@intel.com> [ rjw: Simplifications, changelog & subject massage ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpi_dbg.c')
-rw-r--r--drivers/acpi/acpi_dbg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpi_dbg.c b/drivers/acpi/acpi_dbg.c
index 1f4128487dd4..dee86925a9a1 100644
--- a/drivers/acpi/acpi_dbg.c
+++ b/drivers/acpi/acpi_dbg.c
@@ -602,7 +602,7 @@ static int acpi_aml_read_user(char __user *buf, int len)
crc->tail = (crc->tail + n) & (ACPI_AML_BUF_SIZE - 1);
ret = n;
out:
- acpi_aml_unlock_fifo(ACPI_AML_OUT_USER, !ret);
+ acpi_aml_unlock_fifo(ACPI_AML_OUT_USER, ret >= 0);
return ret;
}
@@ -672,7 +672,7 @@ static int acpi_aml_write_user(const char __user *buf, int len)
crc->head = (crc->head + n) & (ACPI_AML_BUF_SIZE - 1);
ret = n;
out:
- acpi_aml_unlock_fifo(ACPI_AML_IN_USER, !ret);
+ acpi_aml_unlock_fifo(ACPI_AML_IN_USER, ret >= 0);
return n;
}