[PATCH NEW 5/9] acpi: Use a single type of errors in evaluate functions

Pierre Moreau pierre.morrow at free.fr
Wed May 27 23:40:45 PDT 2015


Signed-off-by: Pierre Moreau <pierre.morrow at free.fr>
---
 drm/nouveau/nouveau_acpi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drm/nouveau/nouveau_acpi.c b/drm/nouveau/nouveau_acpi.c
index 01dbf1d..b837ab1 100644
--- a/drm/nouveau/nouveau_acpi.c
+++ b/drm/nouveau/nouveau_acpi.c
@@ -92,7 +92,7 @@ static int nouveau_evaluate_optimus_dsm(acpi_handle handle, int func, int arg, u
 				      func, &argv4, ACPI_TYPE_BUFFER);
 	if (!obj) {
 		acpi_handle_info(handle, "failed to evaluate _DSM\n");
-		return AE_ERROR;
+		return -EINVAL;
 	} else {
 		if (result && obj->buffer.length == 4) {
 			*result  = obj->buffer.pointer[0];
@@ -142,7 +142,7 @@ static int nouveau_evaluate_mux_dsm(acpi_handle handle, int func, int arg)
 				      func, &argv4, ACPI_TYPE_INTEGER);
 	if (!obj) {
 		acpi_handle_info(handle, "failed to evaluate _DSM\n");
-		return AE_ERROR;
+		return -EINVAL;
 	} else {
 		if (obj->integer.value == 0x80000002)
 			ret = -ENODEV;
-- 
2.4.2



More information about the dri-devel mailing list