From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Fri, 27 Feb 2015 23:49:51 +0000 (-0800)
Subject: Input: ALPS - fix memory leak when detection fails
X-Git-Tag: firefly_0821_release~176^2~541^2~95
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=93050db2065726c7fd0db1b9a53311a74eee94c3;p=firefly-linux-kernel-4.4.55.git

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>
---

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";