HID: sony: Fix cancel_work_sync mismerge
authorFrank Praznik <frank.praznik@oh.rr.com>
Wed, 2 Apr 2014 16:31:19 +0000 (12:31 -0400)
committerJiri Kosina <jkosina@suse.cz>
Thu, 3 Apr 2014 12:23:49 +0000 (14:23 +0200)
commit2cf8ee9044d744df57adf8485f205e8f2d4c6f02
tree9bdd47957be73ac90917e103cc99eb5e0c2b4176
parent0f1b1e6d73cb989ce2c071edc57deade3b084dfe
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>
drivers/hid/hid-sony.c