diff options
| author |   Frank Praznik <frank.praznik@oh.rr.com> | 2014-04-02 12:31:19 -0400 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2014-04-03 14:23:49 +0200 |
| commit | 2cf8ee9044d744df57adf8485f205e8f2d4c6f02 (patch) | |
| tree | 9bdd47957be73ac90917e103cc99eb5e0c2b4176 /drivers/hid/hid-ids.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid (diff) | |
| download | linux-dev-2cf8ee9044d744df57adf8485f205e8f2d4c6f02.tar.xz linux-dev-2cf8ee9044d744df57adf8485f205e8f2d4c6f02.zip | |
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/hid-ids.h')
0 files changed, 0 insertions, 0 deletions