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-Url: https://git.stricted.de/?a=commitdiff_plain;h=2cf8ee9044d744df57adf8485f205e8f2d4c6f02;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.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>
---

diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 69204afea7a4..908de2789219 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);