Commit 3ae821ef authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: sony: fix force feedback mismerge 



Fix unfortunate mismerge between the fixes and sony branch causing
code duplication and unterminated basic block.

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent fa1054a2

drivers/hid/hid-sony.c

+0 −4
Original line number Diff line number Diff line
@@ -1680,10 +1680,6 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) 
			goto err_stop;

	}



	if (sc->quirks & SONY_FF_SUPPORT) {

		ret = sony_init_ff(hdev);

		if (ret < 0)

			goto err_stop;

	if (sc->quirks & SONY_BATTERY_SUPPORT) {

		ret = sony_battery_probe(sc);

		if (ret < 0)