From: Michał Kępień Date: Thu, 9 Mar 2017 12:11:44 +0000 (+0100) Subject: platform/x86: ideapad-laptop: remove sparse_keymap_free() calls X-Git-Tag: v4.12-rc1~101^2~89 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c973d4b578a46f8fb822bed2d3a0d3a752d02ecf;p=karo-tx-linux.git platform/x86: ideapad-laptop: 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: Michał Kępień Signed-off-by: Andy Shevchenko --- diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c index cc6d91e18683..ca5eeb4d417d 100644 --- a/drivers/platform/x86/ideapad-laptop.c +++ b/drivers/platform/x86/ideapad-laptop.c @@ -604,14 +604,12 @@ static int ideapad_input_init(struct ideapad_private *priv) error = input_register_device(inputdev); if (error) { pr_err("Unable to register input device\n"); - goto err_free_keymap; + goto err_free_dev; } priv->inputdev = inputdev; return 0; -err_free_keymap: - sparse_keymap_free(inputdev); err_free_dev: input_free_device(inputdev); return error; @@ -619,7 +617,6 @@ err_free_dev: static void ideapad_input_exit(struct ideapad_private *priv) { - sparse_keymap_free(priv->inputdev); input_unregister_device(priv->inputdev); priv->inputdev = NULL; }