summary refs log tree commit diff
path: root/drivers
diff options
context:
space:
mode:
authorChuhong Yuan <hslester96@gmail.com>2019-11-15 11:32:36 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-11-15 11:46:33 -0800
commitba60cf9f78f0d7c8e73c7390608f7f818ee68aa0 (patch)
tree397acf8a1f6124f1810863ed9f330b67c5e1944d /drivers
parentfa3a5a1880c91bb92594ad42dfe9eedad7996b86 (diff)
downloadlinux-ba60cf9f78f0d7c8e73c7390608f7f818ee68aa0.tar.gz
Input: synaptics-rmi4 - destroy F54 poller workqueue when removing
The driver forgets to destroy workqueue in remove() similarly to what is
done when probe() fails. Add a call to destroy_workqueue() to fix it.

Since unregistration will wait for the work to finish, we do not need to
cancel/flush the work instance in remove().

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20191114023405.31477-1-hslester96@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/rmi4/rmi_f54.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/rmi4/rmi_f54.c b/drivers/input/rmi4/rmi_f54.c
index 484ae1f97330..897105b9a98b 100644
--- a/drivers/input/rmi4/rmi_f54.c
+++ b/drivers/input/rmi4/rmi_f54.c
@@ -730,6 +730,7 @@ static void rmi_f54_remove(struct rmi_function *fn)
 
 	video_unregister_device(&f54->vdev);
 	v4l2_device_unregister(&f54->v4l2);
+	destroy_workqueue(f54->workqueue);
 }
 
 struct rmi_function_handler rmi_f54_handler = {