diff options
| author | Azael Avalos <coproscefalo@gmail.com> | 2015-11-04 17:28:26 +0100 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2015-11-06 01:09:24 +0100 |
| commit | d2f20619942fe4618160a7fa3dbdcbac335cff59 (patch) | |
| tree | 17314544909f8bd4ab5e133556b0448238acfc20 /drivers | |
| parent | intel_scu_ipc: Protect dev member assignment on ->remove() (diff) | |
| download | linux-d2f20619942fe4618160a7fa3dbdcbac335cff59.tar.xz linux-d2f20619942fe4618160a7fa3dbdcbac335cff59.zip | |
toshiba_acpi: Initialize hotkey_event_type variable
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index beb709f26fc4..c01302989ee4 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -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"); |