]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.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)
committerKhalid Elmously <khalid.elmously@canonical.com>
Wed, 29 Jan 2020 04:45:21 +0000 (23:45 -0500)
BugLink: https://bugs.launchpad.net/bugs/1859712
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/media/radio/si470x/radio-si470x-i2c.c

index 8ce6f9cff74633a5aab9fb87bbe37cca33919874..b60fb6ed5aeb548c18a1ae618024ee21904977ba 100644 (file)
@@ -455,6 +455,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;
 }