From: Frank Praznik <frank.praznik@oh.rr.com>
Date: Wed, 2 Apr 2014 16:31:19 +0000 (-0400)
Subject: HID: sony: Fix cancel_work_sync mismerge
X-Git-Tag: omap-for-v3.16/soc-signed~52^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cf8ee9044d744df57adf8485f205e8f2d4c6f02;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed