diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-02-23 06:35:15 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-02-23 06:35:15 +0100 |
| commit | cbecf716ca618fd44feda6bd9a64a8179d031fc5 (patch) | |
| tree | 186c9f69f0d11f773253c440dac85087f67288b7 /drivers/input/touchscreen/sur40.c | |
| parent | Input: st1232 - add IDLE state as ready condition (diff) | |
| parent | Input: aiptek - convert sysfs sprintf/snprintf family to sysfs_emit (diff) | |
| download | linux-cbecf716ca618fd44feda6bd9a64a8179d031fc5.tar.xz linux-cbecf716ca618fd44feda6bd9a64a8179d031fc5.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 5.12 merge window.
Diffstat (limited to 'drivers/input/touchscreen/sur40.c')
| -rw-r--r-- | drivers/input/touchscreen/sur40.c | 1 |
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; } |