Commit 7e3fd813 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki

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: 287980e4
  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: 287980e4 (remove lots of IS_ERR_VALUE abuses)
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
[ rjw: Simplifications, changelog & subject massage ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent a99cde43
...@@ -602,7 +602,7 @@ static int acpi_aml_read_user(char __user *buf, int len) ...@@ -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); crc->tail = (crc->tail + n) & (ACPI_AML_BUF_SIZE - 1);
ret = n; ret = n;
out: out:
acpi_aml_unlock_fifo(ACPI_AML_OUT_USER, !ret); acpi_aml_unlock_fifo(ACPI_AML_OUT_USER, ret >= 0);
return ret; return ret;
} }
...@@ -672,7 +672,7 @@ static int acpi_aml_write_user(const char __user *buf, int len) ...@@ -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); crc->head = (crc->head + n) & (ACPI_AML_BUF_SIZE - 1);
ret = n; ret = n;
out: out:
acpi_aml_unlock_fifo(ACPI_AML_IN_USER, !ret); acpi_aml_unlock_fifo(ACPI_AML_IN_USER, ret >= 0);
return n; return n;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment