]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Input: elo - fix an error code in elo_connect()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 17 Feb 2021 04:29:05 +0000 (20:29 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 08:39:47 +0000 (09:39 +0100)
[ Upstream commit 0958351e93fa0ac142f6dd8bd844441594f30a57 ]

If elo_setup_10() fails then this should return an error code instead
of success.

Fixes: fae3006e4b42 ("Input: elo - add support for non-pressure-sensitive touchscreens")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/YBKFd5CvDu+jVmfW@mwanda
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/input/touchscreen/elo.c

index 7f2942f3cec6e6290e9edbba7b470e183be68597..0f3146bcfcd0f33ad89ca84208b371dbd36996c4 100644 (file)
@@ -345,8 +345,10 @@ static int elo_connect(struct serio *serio, struct serio_driver *drv)
        switch (elo->id) {
 
        case 0: /* 10-byte protocol */
-               if (elo_setup_10(elo))
+               if (elo_setup_10(elo)) {
+                       err = -EIO;
                        goto fail3;
+               }
 
                break;