diff options
| author | Azael Avalos <coproscefalo@gmail.com> | 2015-11-04 09:28:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-22 20:54:09 -0800 |
| commit | 4f2052f205a8e35943afb4179b2b50f759ab6da2 (patch) | |
| tree | 64f0cc321a10291835d9bb6f4849c758fc808009 | |
| parent | 4b675ad4441e6bb42291a6953843a1e487ba2752 (diff) | |
| download | lwn-4f2052f205a8e35943afb4179b2b50f759ab6da2.tar.gz lwn-4f2052f205a8e35943afb4179b2b50f759ab6da2.zip | |
toshiba_acpi: Initialize hotkey_event_type variable
commit d2f20619942fe4618160a7fa3dbdcbac335cff59 upstream.
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.
Signed-off-by: Azael Avalos <coproscefalo@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 93e54a0f471a..35882dd690a6 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -2764,6 +2764,7 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev) ret = toshiba_function_keys_get(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"); |