diff options
| author | Roderick Colenbrander <roderick.colenbrander@sony.com> | 2016-12-08 19:09:50 -0800 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-12-19 15:07:37 +0100 |
| commit | 2b6579d4a71afb19c6583470783371b992944f67 (patch) | |
| tree | a88edfafb46b6137f5faaa0ed18456bf31a59846 /drivers/hid | |
| parent | c8b1b3dd89ea7b3f77a73e59c4c4495e16338e15 (diff) | |
| download | linux-2b6579d4a71afb19c6583470783371b992944f67.tar.bz2 | |
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>
Diffstat (limited to 'drivers/hid')
| -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 7687c0875395..f68c921af55e 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -2548,7 +2548,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); |