]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitcd14b69cf42cb78a5d567c57a8d2f41c111c8ea2
tree9bdd47957be73ac90917e103cc99eb5e0c2b4176
parent0f939bf6b15d7121cfca0696c5a1e4f712e9e63d
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