diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-05-18 09:24:30 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-05-18 09:24:30 -0400 |
| commit | 6b7781b42dc9bc9bcd1523b6c24b876cdda0bef3 (patch) | |
| tree | ee55c67e4ea30b9eb44f301ba0bde2e631a26162 /drivers/platform/x86/msi-wmi.c | |
| parent | 52d9d38c183bf0e09601d875ea31bb53c05dd8cf (diff) | |
| parent | e98c58e55f68f8785aebfab1f8c9a03d8de0afe1 (diff) | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
Picking up drm-next @ 4.12-rc1 in order to apply Michal Hocko's vmalloc patch set
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/platform/x86/msi-wmi.c')
| -rw-r--r-- | drivers/platform/x86/msi-wmi.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c index 9a32f8627ecc..f6209b739ec0 100644 --- a/drivers/platform/x86/msi-wmi.c +++ b/drivers/platform/x86/msi-wmi.c @@ -281,14 +281,12 @@ static int __init msi_wmi_input_setup(void) err = input_register_device(msi_wmi_input_dev); if (err) - goto err_free_keymap; + goto err_free_dev; last_pressed = 0; return 0; -err_free_keymap: - sparse_keymap_free(msi_wmi_input_dev); err_free_dev: input_free_device(msi_wmi_input_dev); return err; @@ -342,10 +340,8 @@ err_uninstall_handler: if (event_wmi) wmi_remove_notify_handler(event_wmi->guid); err_free_input: - if (event_wmi) { - sparse_keymap_free(msi_wmi_input_dev); + if (event_wmi) input_unregister_device(msi_wmi_input_dev); - } return err; } @@ -353,7 +349,6 @@ static void __exit msi_wmi_exit(void) { if (event_wmi) { wmi_remove_notify_handler(event_wmi->guid); - sparse_keymap_free(msi_wmi_input_dev); input_unregister_device(msi_wmi_input_dev); } backlight_device_unregister(backlight); |