summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorChuhong Yuan <hslester96@gmail.com>2019-11-10 07:28:15 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-04 13:39:50 +0100
commit4111f10e9014309f152f8c7855c21059e73aa934 (patch)
treede55b7524646ef894895f6e87c872fdd94d7b78e /drivers/media
parent61d8117f13976bcb4e70c4c52509238b5efc8354 (diff)
media: si470x-i2c: add missed operations in remove
[ 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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/radio/si470x/radio-si470x-i2c.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c
index f218886c504d..fb69534a8b56 100644
--- a/drivers/media/radio/si470x/radio-si470x-i2c.c
+++ b/drivers/media/radio/si470x/radio-si470x-i2c.c
@@ -460,6 +460,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;
}