summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2021-02-16 20:30:45 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2021-02-16 20:39:53 -0800
commitb0b7d2815839024e5181bd2572f5d8d4f65363b3 (patch)
treef59524074600778540900d9af87e0caea0a0daa0 /drivers/input
parentede6747c2f8975892ab98bed94357dc8c35d790c (diff)
downloadlinux-stable-b0b7d2815839024e5181bd2572f5d8d4f65363b3.tar.gz
linux-stable-b0b7d2815839024e5181bd2572f5d8d4f65363b3.tar.bz2
linux-stable-b0b7d2815839024e5181bd2572f5d8d4f65363b3.zip
Input: sur40 - fix an error code in sur40_probe()
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>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/sur40.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c
index 620cdd7d214a..12f2562b0141 100644
--- a/drivers/input/touchscreen/sur40.c
+++ b/drivers/input/touchscreen/sur40.c
@@ -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;
}