lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 101/176] Input: elo - fix an error code in elo_connect()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ 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 | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/input/touchscreen/elo.c b/drivers/input/touchscreen/elo.c
    index 83433e8efff70..9642b0dd24f9b 100644
    --- a/drivers/input/touchscreen/elo.c
    +++ b/drivers/input/touchscreen/elo.c
    @@ -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;

    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-01 20:20    [W:4.496 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site