HID: sony: Fix cancel_work_sync mismerge

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Remove redundant cancel_work_sync() call caused by mismerge.

Signed-off-by: Frank Praznik <frank.praznik@oh.rr.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

authored by

Frank Praznik and committed by

Jiri Kosina 12 years ago 2cf8ee90 0f1b1e6d

-2

1 changed file

expand all

drivers

hid

hid-sony.c

-2

drivers/hid/hid-sony.c

··· 1721 1721 if (sc->quirks & SONY_LED_SUPPORT) 1722 1722 sony_leds_remove(hdev); 1723 1723 1724 - if (sc->worker_initialized) 1725 - cancel_work_sync(&sc->state_worker); 1726 1724 if (sc->quirks & SONY_BATTERY_SUPPORT) { 1727 1725 hid_hw_close(hdev); 1728 1726 sony_battery_remove(sc);