Input: sur40 - fix an error code in sur40_probe()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 17 Feb 2021 04:30:45 +0000 (20:30 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 10:38:09 +0000 (11:38 +0100)
[ Upstream commit b0b7d2815839024e5181bd2572f5d8d4f65363b3 ]

If v4l2_ctrl_handler_setup() fails then probe() should return an error
code instead of returning success.

Fixes: cee1e3e2ef39 ("media: add video control handlers using V4L2 control framework")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/YBKFkbATXa5fA3xj@mwanda
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/input/touchscreen/sur40.c

index 620cdd7..12f2562 100644 (file)
@@ -787,6 +787,7 @@ static int sur40_probe(struct usb_interface *interface,
                dev_err(&interface->dev,
                        "Unable to register video controls.");
                v4l2_ctrl_handler_free(&sur40->hdl);
+               error = sur40->hdl.error;
                goto err_unreg_v4l2;
        }