2019-11-14 02:37:43

by Chuhong Yuan

Subject: [PATCH v2] Input: synaptics-rmi4 - add missed operations in remove

The driver forgets to destroy workqueue in remove like 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 deal with work in remove.

Signed-off-by: Chuhong Yuan <[email protected]>
---
Changes in v2:
- Remove the calls of canceling delay and flushing workqueue.
- Modify the commit message.

drivers/input/rmi4/rmi_f54.c | 1 +
1 file changed, 1 insertion(+)

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 = {
--
2.23.0

2019-11-15 19:38:30

by Dmitry Torokhov

Subject: Re: [PATCH v2] Input: synaptics-rmi4 - add missed operations in remove

On Thu, Nov 14, 2019 at 10:34:05AM +0800, Chuhong Yuan wrote:
> The driver forgets to destroy workqueue in remove like 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 deal with work in remove.
>
> Signed-off-by: Chuhong Yuan <[email protected]>

Applied, thank you.

> ---
> Changes in v2:
> - Remove the calls of canceling delay and flushing workqueue.
> - Modify the commit message.
>
> drivers/input/rmi4/rmi_f54.c | 1 +
> 1 file changed, 1 insertion(+)
>
> 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 = {
> --
> 2.23.0
>

--
Dmitry