Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5ee6e41 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls() 



The field current_norm does not have to be set for g_parm to be a valid
ioctl. Remove that check, but add a check whether this is a video node
instead as g_parm only makes sense for those nodes.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0c142c86

drivers/media/video/v4l2-dev.c

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ static void determine_valid_ioctls(struct video_device *vdev) 
	SET_VALID_IOCTL(ops, VIDIOC_TRY_ENCODER_CMD, vidioc_try_encoder_cmd);

	SET_VALID_IOCTL(ops, VIDIOC_DECODER_CMD, vidioc_decoder_cmd);

	SET_VALID_IOCTL(ops, VIDIOC_TRY_DECODER_CMD, vidioc_try_decoder_cmd);

	if (ops->vidioc_g_parm || vdev->current_norm)

	if (ops->vidioc_g_parm || vdev->vfl_type == VFL_TYPE_GRABBER)

		set_bit(_IOC_NR(VIDIOC_G_PARM), valid_ioctls);

	SET_VALID_IOCTL(ops, VIDIOC_S_PARM, vidioc_s_parm);

	SET_VALID_IOCTL(ops, VIDIOC_G_TUNER, vidioc_g_tuner);