From 75a0359f29435df5d44fce307a06aab73fa6ae08 Mon Sep 17 00:00:00 2001 From: Michael Tretter Date: Thu, 19 Mar 2020 10:16:30 +0100 Subject: [PATCH] media: staging: allegro: fix broken registration of controls Since commit cc62c74749a3 ("media: allegro: add missed checks in allegro_open()") the allegro device does provide v4l2 controls to user space anymore. The reason is that v4l2_fh_init() initializes fh->ctrl_handler to vdev->ctrl_handler, which invalidates the previous driver override of the ctrl_handler. Therefore, v4l2_fh_init() must be called before the driver overrides the fh->ctrl_handler with its own handler. Move the initialization of the fh back to the top, as the initialization does not does not need to be reverted on errors, but it is enough to free the channel. Fixes: cc62c74749a3 ("media: allegro: add missed checks in allegro_open()") Signed-off-by: Michael Tretter Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/allegro-dvt/allegro-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/allegro-dvt/allegro-core.c b/drivers/staging/media/allegro-dvt/allegro-core.c index 3c949090e8d2..218164158a04 100644 --- a/drivers/staging/media/allegro-dvt/allegro-core.c +++ b/drivers/staging/media/allegro-dvt/allegro-core.c @@ -2276,6 +2276,8 @@ static int allegro_open(struct file *file) if (!channel) return -ENOMEM; + v4l2_fh_init(&channel->fh, vdev); + init_completion(&channel->completion); channel->dev = dev; @@ -2348,7 +2350,6 @@ static int allegro_open(struct file *file) goto error; } - v4l2_fh_init(&channel->fh, vdev); file->private_data = &channel->fh; v4l2_fh_add(&channel->fh); -- 2.30.2