From: Michal Malý Date: Wed, 8 Apr 2015 20:56:47 +0000 (+0200) Subject: HID: hid-lg4ff: Stop the hid device from lg4ff X-Git-Tag: firefly_0821_release~176^2~1610^2~1^3~8 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b211a6388ca279a16a6627da2f3681a2cab18444;p=firefly-linux-kernel-4.4.55.git HID: hid-lg4ff: Stop the hid device from lg4ff Stop the hid device from lg4ff. Originally hid-lg was responsible for stopping of the device. Signed-off-by: Michal Malý Signed-off-by: Jiri Kosina --- diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c index 3f01da695d5e..d5022b3130d0 100644 --- a/drivers/hid/hid-lg.c +++ b/drivers/hid/hid-lg.c @@ -735,8 +735,8 @@ static void lg_remove(struct hid_device *hdev) struct lg_drv_data *drv_data = hid_get_drvdata(hdev); if (drv_data->quirks & LG_FF4) lg4ff_deinit(hdev); - - hid_hw_stop(hdev); + else + hid_hw_stop(hdev); kfree(drv_data); } diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c index 0f8d72694aaa..031b8abd7131 100644 --- a/drivers/hid/hid-lg4ff.c +++ b/drivers/hid/hid-lg4ff.c @@ -1213,6 +1213,8 @@ int lg4ff_deinit(struct hid_device *hid) } } #endif + hid_hw_stop(hid); + drv_data->device_props = NULL; kfree(entry); out: