Skip to content

Commit

Permalink
platform/x86: thinkpad_acpi: Initialize local in_tablet_mode and type
Browse files Browse the repository at this point in the history
linux-next reported in_tablet_mode and type may be used uninitialized
after:

b318002 ("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 and type are 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 and type to NULL.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Lyude <lyude@redhat.com>
  • Loading branch information
dvhart committed Dec 15, 2016
1 parent 1d161d4 commit cb2bf25
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/platform/x86/thinkpad_acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -3143,8 +3143,8 @@ typedef tpacpi_keymap_entry_t tpacpi_keymap_t[TPACPI_HOTKEY_MAP_LEN];

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

if (acpi_evalf(hkey_handle, &res, "MHKG", "qd")) {
/* For X41t, X60t, X61t Tablets... */
Expand Down

0 comments on commit cb2bf25

Please sign in to comment.