|
@@ -1205,14 +1205,12 @@ static int eeepc_input_init(struct eeepc_laptop *eeepc)
|
|
error = input_register_device(input);
|
|
error = input_register_device(input);
|
|
if (error) {
|
|
if (error) {
|
|
pr_err("Unable to register input device\n");
|
|
pr_err("Unable to register input device\n");
|
|
- goto err_free_keymap;
|
|
|
|
|
|
+ goto err_free_dev;
|
|
}
|
|
}
|
|
|
|
|
|
eeepc->inputdev = input;
|
|
eeepc->inputdev = input;
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
-err_free_keymap:
|
|
|
|
- sparse_keymap_free(input);
|
|
|
|
err_free_dev:
|
|
err_free_dev:
|
|
input_free_device(input);
|
|
input_free_device(input);
|
|
return error;
|
|
return error;
|
|
@@ -1220,10 +1218,8 @@ err_free_dev:
|
|
|
|
|
|
static void eeepc_input_exit(struct eeepc_laptop *eeepc)
|
|
static void eeepc_input_exit(struct eeepc_laptop *eeepc)
|
|
{
|
|
{
|
|
- if (eeepc->inputdev) {
|
|
|
|
- sparse_keymap_free(eeepc->inputdev);
|
|
|
|
|
|
+ if (eeepc->inputdev)
|
|
input_unregister_device(eeepc->inputdev);
|
|
input_unregister_device(eeepc->inputdev);
|
|
- }
|
|
|
|
eeepc->inputdev = NULL;
|
|
eeepc->inputdev = NULL;
|
|
}
|
|
}
|
|
|
|
|