toshiba_acpi: Initialize hotkey_event_type variable
authorAzael Avalos <coproscefalo@gmail.com>
Wed, 4 Nov 2015 16:28:26 +0000 (09:28 -0700)
committerDarren Hart <dvhart@linux.intel.com>
Fri, 6 Nov 2015 00:09:24 +0000 (16:09 -0800)
Commit 53147b6cabee5e8d1997b5682fcc0c3b72ddf9c2 ("toshiba_acpi: Fix
hotkeys registration on some toshiba models") fixed an issue on some
laptops regarding hotkeys registration, however, if failed to address
the initialization of the hotkey_event_type variable, and thus, it can
lead to potential unwanted effects as the variable is being checked.

This patch initializes such variable to avoid such unwanted effects.

Cc: <stable@vger.kernel.org> # 4.1+
Signed-off-by: Azael Avalos <coproscefalo@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
drivers/platform/x86/toshiba_acpi.c

index beb709f26fc4f88637b7f5a647961025ab3bd8bc..c01302989ee47817eb37acac36755c63dd0b262c 100644 (file)
@@ -2665,6 +2665,7 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev)
        ret = toshiba_function_keys_get(dev, &dev->special_functions);
        dev->kbd_function_keys_supported = !ret;
 
+       dev->hotkey_event_type = 0;
        if (toshiba_acpi_setup_keyboard(dev))
                pr_info("Unable to activate hotkeys\n");