redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

HID: sony: Make sure to unregister sensors on failure 

Make sure we sure register any sensor when sony_input_configured failes.
Somehow this line got lost during resolving of merge conflicts in the
motion sensor patch series and a redudant remove was added as well later
on.

Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
hifive-unleashed-5.1
Roderick Colenbrander 2017-03-24 15:17:50 -07:00 committed by Jiri Kosina
parent 77b499e739
commit a676bdc422
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/hid/hid-sony.c
View File

@ -2696,6 +2696,8 @@ err_stop:
sony_leds_remove(sc);
if (sc->quirks & SONY_BATTERY_SUPPORT)
sony_battery_remove(sc);
if (sc->sensor_dev)
sony_unregister_sensors(sc);
sony_cancel_work_sync(sc);
kfree(sc->output_report_dmabuf);
sony_remove_dev_list(sc);
@ -2786,9 +2788,6 @@ static void sony_remove(struct hid_device *hdev)
if (sc->sensor_dev)
sony_unregister_sensors(sc);
if (sc->sensor_dev)
sony_unregister_sensors(sc);
if (sc->quirks & DUALSHOCK4_CONTROLLER_BT)
device_remove_file(&sc->hdev->dev, &dev_attr_bt_poll_interval);