ACPI: thinkpad-acpi: fix hotkey_get_tablet_mode

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Henrique de Moraes Holschuh
Date: Tuesday, February 26, 2008 - 3:12 pm

I used the wrong return convention on hotkey_get_tablet_mode(), breaking a
lot of stuff.  Bad Henrique!

Fix it to return the status in the parameter-by-reference, and IO status on
the function return value. Duh.

Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Zdenek Kabelac <zdenek.kabelac@gmail.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Lukas Hejtmanek <xhejtman@ics.muni.cz>
---
 drivers/misc/thinkpad_acpi.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index bb269d0..6cb7812 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -1078,7 +1078,8 @@ static int hotkey_get_tablet_mode(int *status)
 	if (!acpi_evalf(hkey_handle, &s, "MHKG", "d"))
 		return -EIO;
 
-	return ((s & TP_HOTKEY_TABLET_MASK) != 0);
+	*status = ((s & TP_HOTKEY_TABLET_MASK) != 0);
+	return 0;
 }
 
 /*
-- 
1.5.4.2

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
2.6.25-rc2 Regression Thinkpad acpi, Lukas Hejtmanek, (Mon Feb 25, 2:39 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Rafael J. Wysocki, (Mon Feb 25, 4:47 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Henrique de Moraes H ..., (Mon Feb 25, 1:03 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Lukas Hejtmanek, (Mon Feb 25, 1:49 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Henrique de Moraes H ..., (Mon Feb 25, 2:01 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Lukas Hejtmanek, (Mon Feb 25, 3:07 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Henrique de Moraes H ..., (Mon Feb 25, 4:00 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Tomas Carnecky, (Mon Feb 25, 4:03 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Rafael J. Wysocki, (Mon Feb 25, 4:05 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Lukas Hejtmanek, (Tue Feb 26, 11:49 am)
ACPI: thinkpad-acpi: fix hotkey_get_tablet_mode, Henrique de Moraes H ..., (Tue Feb 26, 3:12 pm)
Dell OptiPlex 320 - Core 2 Duo, Nuno Tavares, (Wed Feb 27, 4:54 am)
Re: Dell OptiPlex 320 - Core 2 Duo, Xavier Bestel, (Wed Feb 27, 6:09 am)
Re: Dell OptiPlex 320 - Core 2 Duo, Lennart Sorensen, (Wed Feb 27, 7:32 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Jens Axboe, (Tue Mar 4, 12:45 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Alexey Starikovskiy, (Tue Mar 4, 2:09 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Jens Axboe, (Tue Mar 4, 2:12 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Alexey Starikovskiy, (Tue Mar 4, 2:24 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Jens Axboe, (Wed Mar 12, 5:59 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Henrique de Moraes H ..., (Wed Mar 12, 6:17 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Jens Axboe, (Wed Mar 12, 6:24 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Henrique de Moraes H ..., (Wed Mar 12, 6:35 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Lukas Hejtmanek, (Wed Mar 12, 6:55 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Henrique de Moraes H ..., (Wed Mar 12, 10:39 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Arkadiusz Miskiewicz, (Wed Mar 12, 11:52 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Lukas Hejtmanek, (Wed Mar 12, 12:36 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Henrique de Moraes H ..., (Wed Mar 12, 2:13 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Arkadiusz Miskiewicz, (Thu Mar 13, 12:30 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Lukas Hejtmanek, (Thu Mar 13, 12:33 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Jens Axboe, (Thu Mar 13, 5:05 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Lukas Hejtmanek, (Thu Mar 13, 5:23 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Jens Axboe, (Thu Mar 13, 5:46 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Lukas Hejtmanek, (Thu Mar 13, 5:55 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Jens Axboe, (Thu Mar 13, 5:59 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Lukas Hejtmanek, (Thu Mar 13, 6:09 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Jens Axboe, (Thu Mar 13, 6:13 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Alexey Starikovskiy, (Thu Mar 13, 7:37 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Jens Axboe, (Thu Mar 13, 7:39 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Alexey Starikovskiy, (Thu Mar 13, 7:52 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Jens Axboe, (Thu Mar 13, 7:59 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Alexey Starikovskiy, (Thu Mar 13, 8:04 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Jens Axboe, (Thu Mar 13, 8:09 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Henrique de Moraes H ..., (Thu Mar 13, 3:53 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Henrique de Moraes H ..., (Thu Mar 13, 3:55 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Henrique de Moraes H ..., (Thu Mar 13, 4:17 pm)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Jens Axboe, (Fri Mar 14, 12:05 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Jens Axboe, (Fri Mar 14, 12:30 am)
Re: 2.6.25-rc2 Regression Thinkpad acpi, Arkadiusz Miskiewicz, (Fri Mar 14, 11:23 am)