| Message ID | 1396456285-23755-2-git-send-email-frank.praznik@oh.rr.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
On Wed, 2 Apr 2014, Frank Praznik wrote: > Remove redundant cancel_work_sync() call caused by mismerge. > > Signed-off-by: Frank Praznik <frank.praznik@oh.rr.com> Queued for 3.15, thanks for spotting it, Frank.
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 69204af..908de27 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);
Remove redundant cancel_work_sync() call caused by mismerge. Signed-off-by: Frank Praznik <frank.praznik@oh.rr.com> --- Apply against jikos/hid.git/for-linus to fix mismerge code duplication drivers/hid/hid-sony.c | 2 -- 1 file changed, 2 deletions(-)