Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754918AbcLOEOb (ORCPT ); Wed, 14 Dec 2016 23:14:31 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:49834 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752886AbcLOEOa (ORCPT ); Wed, 14 Dec 2016 23:14:30 -0500 Date: Wed, 14 Dec 2016 20:14:24 -0800 From: Darren Hart To: Lyude , Henrique de Moraes Holschuh , Andy Shevchenko Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, platform-drivers-x86@vger.kernel.org Subject: [PATCH v2] platform/x86: thinkpad_acpi: Initialize local in_tablet_mode and type Message-ID: <20161215041424.GA19534@f23x64.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1414 Lines: 45 linux-next reported in_tablet_mode and type 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 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 "". Signed-off-by: Darren Hart Cc: Lyude Cc: Henrique de Moraes Holschuh Cc: Andy Shevchenko --- Since v1: Initialize type also. drivers/platform/x86/thinkpad_acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 69cb0da..c408390 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -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 = ""; if (acpi_evalf(hkey_handle, &res, "MHKG", "qd")) { /* For X41t, X60t, X61t Tablets... */ -- 2.9.3 -- Darren Hart Intel Open Source Technology Center