Skip to content

Commit

Permalink
HID: sony: Fix error handling bug when touchpad registration fails
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Roderick Colenbrander authored and Jiri Kosina committed Dec 19, 2016
1 parent c8b1b3d commit 2b6579d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/hid/hid-sony.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 2b6579d

Please sign in to comment.