summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2017-04-10 20:48:16 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-04-10 20:51:49 -0700
commit9bb9dc1359ef40a10153cd8c7106dd9d9e8aa1a3 (patch)
tree458278924a8d857b4c77cd496899511046cda1b0 /drivers/input
parent81093c9848a781b85163d06de92ef8f84528cf6a (diff)
downloadlinux-stable-9bb9dc1359ef40a10153cd8c7106dd9d9e8aa1a3.tar.gz
linux-stable-9bb9dc1359ef40a10153cd8c7106dd9d9e8aa1a3.tar.bz2
linux-stable-9bb9dc1359ef40a10153cd8c7106dd9d9e8aa1a3.zip
Input: omap-keypad - fix error handling code
According to the previous error handling code, it is likely that 'goto err_free_keymap' is expected here in order to avoid a memory leak in error handling path. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/omap4-keypad.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index ebc67ba41fe2..940d38b08e6b 100644
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -358,7 +358,7 @@ static int omap4_keypad_probe(struct platform_device *pdev)
"omap4-keypad", keypad_data);
if (error) {
dev_err(&pdev->dev, "failed to register interrupt\n");
- goto err_free_input;
+ goto err_free_keymap;
}
device_init_wakeup(&pdev->dev, true);