diff options
| author | Roderick Colenbrander <roderick.colenbrander@sony.com> | 2016-12-08 19:09:50 -0800 |
|---|---|---|
| committer | Siarhei Vishniakou <svv@google.com> | 2019-11-07 11:13:41 -0600 |
| commit | 7a3cc478c0a05f2edbdab161080dcb4d3c9cce1f (patch) | |
| tree | 97f6d812906c4127b9d15603bbaf1c494c2c5bfc | |
| parent | 7ec96e9f0cf95ffadff651ff539c076c94bcfc73 (diff) | |
UPSTREAM: HID: sony: Fix error handling bug when touchpad registration fails
The error handling code in sony_input_configured in general uses goto
based cleanup. Recently we migrated code from sony_probe to here, but
we didn't update the existing touchpad registration code, which was
already here to use the goto.
Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit 2b6579d4a71afb19c6583470783371b992944f67)
Bug: 111431828
Signed-off-by: Kim Low <kim-huei.low@sony.com>
Change-Id: I00b37e52eb1798110427b02c72122e464cb9baab
Signed-off-by: Siarhei Vishniakou <svv@google.com>
| -rw-r--r-- | drivers/hid/hid-sony.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 3a8efd688ab7..5bfeea6ee3b4 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -2549,7 +2549,7 @@ static int sony_input_configured(struct hid_device *hdev, hid_err(sc->hdev, "Unable to initialize multi-touch slots: %d\n", ret); - return ret; + goto err_stop; } sony_init_output_report(sc, dualshock4_send_output_report); |