Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial

[~andy/linux] / drivers / misc / thinkpad_acpi.c

diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index bb269d0c677edbc4cadd268dc634e90b6120a80e..6cb781262f947611a20916bf6b996c9ff3e713cb 100644 (file)
--- 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;
 }
 
 /*