summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorFrank Praznik <frank.praznik@oh.rr.com>2014-04-02 12:31:19 -0400
committerJiri Kosina <jkosina@suse.cz>2014-04-03 14:23:49 +0200
commit2cf8ee9044d744df57adf8485f205e8f2d4c6f02 (patch)
tree9bdd47957be73ac90917e103cc99eb5e0c2b4176 /drivers/hid
parent0f1b1e6d73cb989ce2c071edc57deade3b084dfe (diff)
downloadop-kernel-dev-2cf8ee9044d744df57adf8485f205e8f2d4c6f02.zip
op-kernel-dev-2cf8ee9044d744df57adf8485f205e8f2d4c6f02.tar.gz
HID: sony: Fix cancel_work_sync mismerge
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>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-sony.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 69204af..908de27 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -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);
OpenPOWER on IntegriCloud