Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a676bdc4 authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Jiri Kosina
Browse files

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: default avatarRoderick Colenbrander <roderick.colenbrander@sony.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 77b499e7

drivers/hid/hid-sony.c

+2 −3
Original line number Diff line number Diff line
@@ -2696,6 +2696,8 @@ static int sony_input_configured(struct hid_device *hdev, 
		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);