Commit db8f95d0 authored by Michał Kępień's avatar Michał Kępień Committed by Darren Hart

platform/x86: toshiba_acpi: remove sparse_keymap_free() calls

As sparse_keymap_setup() now uses a managed memory allocation for the
keymap copy it creates, the latter is freed automatically.  Remove all
calls to sparse_keymap_free().
Signed-off-by: default avatarMichał Kępień <kernel@kempniu.pl>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent c6d973f4
...@@ -2849,7 +2849,7 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev) ...@@ -2849,7 +2849,7 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev)
error = i8042_install_filter(toshiba_acpi_i8042_filter); error = i8042_install_filter(toshiba_acpi_i8042_filter);
if (error) { if (error) {
pr_err("Error installing key filter\n"); pr_err("Error installing key filter\n");
goto err_free_keymap; goto err_free_dev;
} }
dev->ntfy_supported = 1; dev->ntfy_supported = 1;
...@@ -2880,8 +2880,6 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev) ...@@ -2880,8 +2880,6 @@ static int toshiba_acpi_setup_keyboard(struct toshiba_acpi_dev *dev)
err_remove_filter: err_remove_filter:
if (dev->ntfy_supported) if (dev->ntfy_supported)
i8042_remove_filter(toshiba_acpi_i8042_filter); i8042_remove_filter(toshiba_acpi_i8042_filter);
err_free_keymap:
sparse_keymap_free(dev->hotkey_dev);
err_free_dev: err_free_dev:
input_free_device(dev->hotkey_dev); input_free_device(dev->hotkey_dev);
dev->hotkey_dev = NULL; dev->hotkey_dev = NULL;
...@@ -3018,10 +3016,8 @@ static int toshiba_acpi_remove(struct acpi_device *acpi_dev) ...@@ -3018,10 +3016,8 @@ static int toshiba_acpi_remove(struct acpi_device *acpi_dev)
cancel_work_sync(&dev->hotkey_work); cancel_work_sync(&dev->hotkey_work);
} }
if (dev->hotkey_dev) { if (dev->hotkey_dev)
input_unregister_device(dev->hotkey_dev); input_unregister_device(dev->hotkey_dev);
sparse_keymap_free(dev->hotkey_dev);
}
backlight_device_unregister(dev->backlight_dev); backlight_device_unregister(dev->backlight_dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment