]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: si470x-i2c: add missed operations in remove
authorChuhong Yuan <hslester96@gmail.com>
Sun, 10 Nov 2019 06:28:15 +0000 (07:28 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:35:57 +0000 (16:35 +0100)
[ Upstream commit 2df200ab234a86836a8879a05a8007d6b884eb14 ]

The driver misses calling v4l2_ctrl_handler_free and
v4l2_device_unregister in remove like what is done in probe failure.
Add the calls to fix it.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/radio/si470x/radio-si470x-i2c.c

index e3b3ecd14a4dd38803cec253a5eefc18ef723af4..ae7540b765e1dd81659bbaf99e4b5612b284d2aa 100644 (file)
@@ -485,6 +485,8 @@ static int si470x_i2c_remove(struct i2c_client *client)
        video_unregister_device(&radio->videodev);
        kfree(radio);
 
+       v4l2_ctrl_handler_free(&radio->hdl);
+       v4l2_device_unregister(&radio->v4l2_dev);
        return 0;
 }