summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Malý <madcatxster@devoid-pointer.net>2015-04-08 23:56:47 +0300
committerJiri Kosina <jkosina@suse.cz>2015-05-07 17:27:10 +0300
commitb211a6388ca279a16a6627da2f3681a2cab18444 (patch)
tree6b8a9f114d2ff7dc9aecfb8d118c70cd8df3f295
parent72529c65a5399be02c619ed8592e38a3e5f049f3 (diff)
downloadlinux-b211a6388ca279a16a6627da2f3681a2cab18444.tar.xz
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ý <madcatxster@devoid-pointer.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-lg.c4
-rw-r--r--drivers/hid/hid-lg4ff.c2
2 files changed, 4 insertions, 2 deletions
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: