iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: vivid: call v4l2_event_wake_all() on disconnect

Browse Source 
When the disconnect error injection control is set, then besides
faking unregistering the device nodes, also call v4l2_event_wake_all()
to ensure any userspace applications will wake up as per a 'normal'
unregister.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Hans Verkuil 2020-12-01 13:44:44 +01:00 committed by Mauro Carvalho Chehab
parent 28955a6156
commit b996922bed
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/media/test-drivers/vivid/vivid-ctrls.c
View File

@ -100,6 +100,14 @@
/* General User Controls */
static void vivid_unregister_dev(bool valid, struct video_device *vdev)
{
if (!valid)
return;
clear_bit(V4L2_FL_REGISTERED, &vdev->flags);
v4l2_event_wake_all(vdev);
}
static int vivid_user_gen_s_ctrl(struct v4l2_ctrl *ctrl)
{
struct vivid_dev *dev = container_of(ctrl->handler, struct vivid_dev, ctrl_hdl_user_gen);
@ -108,26 +116,16 @@ static int vivid_user_gen_s_ctrl(struct v4l2_ctrl *ctrl)
case VIVID_CID_DISCONNECT:
v4l2_info(&dev->v4l2_dev, "disconnect\n");
dev->disconnect_error = true;
if (dev->has_vid_cap)
clear_bit(V4L2_FL_REGISTERED, &dev->vid_cap_dev.flags);
if (dev->has_vid_out)
clear_bit(V4L2_FL_REGISTERED, &dev->vid_out_dev.flags);
if (dev->has_vbi_cap)
clear_bit(V4L2_FL_REGISTERED, &dev->vbi_cap_dev.flags);
if (dev->has_vbi_out)
clear_bit(V4L2_FL_REGISTERED, &dev->vbi_out_dev.flags);
if (dev->has_radio_rx)
clear_bit(V4L2_FL_REGISTERED, &dev->radio_rx_dev.flags);
if (dev->has_radio_tx)
clear_bit(V4L2_FL_REGISTERED, &dev->radio_tx_dev.flags);
if (dev->has_sdr_cap)
clear_bit(V4L2_FL_REGISTERED, &dev->sdr_cap_dev.flags);
if (dev->has_meta_cap)
clear_bit(V4L2_FL_REGISTERED, &dev->meta_cap_dev.flags);
if (dev->has_meta_out)
clear_bit(V4L2_FL_REGISTERED, &dev->meta_out_dev.flags);
if (dev->has_touch_cap)
clear_bit(V4L2_FL_REGISTERED, &dev->touch_cap_dev.flags);
vivid_unregister_dev(dev->has_vid_cap, &dev->vid_cap_dev);
vivid_unregister_dev(dev->has_vid_out, &dev->vid_out_dev);
vivid_unregister_dev(dev->has_vbi_cap, &dev->vbi_cap_dev);
vivid_unregister_dev(dev->has_vbi_out, &dev->vbi_out_dev);
vivid_unregister_dev(dev->has_radio_rx, &dev->radio_rx_dev);
vivid_unregister_dev(dev->has_radio_tx, &dev->radio_tx_dev);
vivid_unregister_dev(dev->has_sdr_cap, &dev->sdr_cap_dev);
vivid_unregister_dev(dev->has_meta_cap, &dev->meta_cap_dev);
vivid_unregister_dev(dev->has_meta_out, &dev->meta_out_dev);
vivid_unregister_dev(dev->has_touch_cap, &dev->touch_cap_dev);
break;
case VIVID_CID_BUTTON:
dev->button_pressed = 30;