2016-12-14 23:11:33

by Darren Hart

[permalink] [raw]
Subject: [PATCH] platform/x86: thinkpad_acpi: Initialize local in_tablet_mode

linux-next reported in_tablet_mode may be used uninitialized after:

b31800283868 ("platform/x86: thinkpad_acpi: Move tablet detection into separate function")

This turns out to be a false positive as the pr_info call cannot be
reached if tp_features.hotkey_tablet (global scope) is 0, and
in_tablet_mode is assigned in both places tp_features.hotkey_tablet is
assigned.

Regardless, to make it explicit and avoid further reports, initialize
in_tablet_mode to 0.

Signed-off-by: Darren Hart <[email protected]>
Cc: Lyude <[email protected]>
Cc: Henrique de Moraes Holschuh <[email protected]>
Cc: Andy Shevchenko <[email protected]>
---
drivers/platform/x86/thinkpad_acpi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 69cb0da..1c5a6e2 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -3143,7 +3143,7 @@ typedef tpacpi_keymap_entry_t tpacpi_keymap_t[TPACPI_HOTKEY_MAP_LEN];

static int hotkey_init_tablet_mode(void)
{
- int in_tablet_mode, res;
+ int in_tablet_mode = 0, res;
char *type;

if (acpi_evalf(hkey_handle, &res, "MHKG", "qd")) {
--
2.9.3


--
Darren Hart
Intel Open Source Technology Center