aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-02-27 15:49:51 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-03-04 15:17:08 -0800
commit93050db2065726c7fd0db1b9a53311a74eee94c3 (patch)
tree5e755e9ec4a94d8fc5b78c5f9078748f896a9e58 /drivers/input
parentInput: sun4i-ts - add thermal driver dependency (diff)
downloadlinux-dev-93050db2065726c7fd0db1b9a53311a74eee94c3.tar.xz
linux-dev-93050db2065726c7fd0db1b9a53311a74eee94c3.zip
Input: ALPS - fix memory leak when detection fails
This fixes memory leak introduced by commit a09221e83e13e09a33109b9b037484eade901cea Acked-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/alps.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index d28726a0ef85..1bd15ebc01f2 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -2605,8 +2605,10 @@ int alps_detect(struct psmouse *psmouse, bool set_properties)
return -ENOMEM;
error = alps_identify(psmouse, priv);
- if (error)
+ if (error) {
+ kfree(priv);
return error;
+ }
if (set_properties) {
psmouse->vendor = "ALPS";