Commit cee47f5a authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by Linus Torvalds

ACPI: thinkpad-acpi: fix hotkey_get_tablet_mode

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: default avatarHenrique 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent acc1f3ed
...@@ -1078,7 +1078,8 @@ static int hotkey_get_tablet_mode(int *status) ...@@ -1078,7 +1078,8 @@ static int hotkey_get_tablet_mode(int *status)
if (!acpi_evalf(hkey_handle, &s, "MHKG", "d")) if (!acpi_evalf(hkey_handle, &s, "MHKG", "d"))
return -EIO; return -EIO;
return ((s & TP_HOTKEY_TABLET_MASK) != 0); *status = ((s & TP_HOTKEY_TABLET_MASK) != 0);
return 0;
} }
/* /*
......
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