Commit 2cf8ee90 authored by Frank Praznik's avatar Frank Praznik Committed by Jiri Kosina
Browse files

HID: sony: Fix cancel_work_sync mismerge 



Remove redundant cancel_work_sync() call caused by mismerge.

Signed-off-by: default avatarFrank Praznik <frank.praznik@oh.rr.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 0f1b1e6d

drivers/hid/hid-sony.c

+0 −2
Original line number Diff line number Diff line
@@ -1721,8 +1721,6 @@ static void sony_remove(struct hid_device *hdev) 
	if (sc->quirks & SONY_LED_SUPPORT)

		sony_leds_remove(hdev);



	if (sc->worker_initialized)

		cancel_work_sync(&sc->state_worker);

	if (sc->quirks & SONY_BATTERY_SUPPORT) {

		hid_hw_close(hdev);

		sony_battery_remove(sc);