diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-27 18:49:51 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-03-04 18:17:08 -0500 |
commit | 93050db2065726c7fd0db1b9a53311a74eee94c3 (patch) | |
tree | 5e755e9ec4a94d8fc5b78c5f9078748f896a9e58 | |
parent | 4a6155a465650e8a3c7ae4e23b580ad9b84908aa (diff) |
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>
-rw-r--r-- | drivers/input/mouse/alps.c | 4 |
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) | |||
2605 | return -ENOMEM; | 2605 | return -ENOMEM; |
2606 | 2606 | ||
2607 | error = alps_identify(psmouse, priv); | 2607 | error = alps_identify(psmouse, priv); |
2608 | if (error) | 2608 | if (error) { |
2609 | kfree(priv); | ||
2609 | return error; | 2610 | return error; |
2611 | } | ||
2610 | 2612 | ||
2611 | if (set_properties) { | 2613 | if (set_properties) { |
2612 | psmouse->vendor = "ALPS"; | 2614 | psmouse->vendor = "ALPS"; |