ACPI: thinkpad-acpi: fix hotkey_get_tablet_mode
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Tue, 4 Mar 2008 22:29:21 +0000 (14:29 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 5 Mar 2008 00:35:16 +0000 (16:35 -0800)
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>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/misc/thinkpad_acpi.c

index bb269d0..6cb7812 100644 (file)
@@ -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;
 }
 
 /*