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

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

[media] v4l: do not allow modulator ioctls for non-radio devices 



Modulator ioctls could be enabled mistakenly for non-radio devices.
Currently those ioctls are only valid for radio. Fix it.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent c9c54f72

drivers/media/v4l2-core/v4l2-dev.c

+3 −2
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ static void determine_valid_ioctls(struct video_device *vdev) 
	const struct v4l2_ioctl_ops *ops = vdev->ioctl_ops;

	bool is_vid = vdev->vfl_type == VFL_TYPE_GRABBER;

	bool is_vbi = vdev->vfl_type == VFL_TYPE_VBI;

	bool is_radio = vdev->vfl_type == VFL_TYPE_RADIO;

	bool is_sdr = vdev->vfl_type == VFL_TYPE_SDR;

	bool is_rx = vdev->vfl_dir != VFL_DIR_TX;

	bool is_tx = vdev->vfl_dir != VFL_DIR_RX;
@@ -726,8 +727,8 @@ static void determine_valid_ioctls(struct video_device *vdev) 
		SET_VALID_IOCTL(ops, VIDIOC_ENUM_DV_TIMINGS, vidioc_enum_dv_timings);

		SET_VALID_IOCTL(ops, VIDIOC_DV_TIMINGS_CAP, vidioc_dv_timings_cap);

	}

	if (is_tx) {

		/* transmitter only ioctls */

	if (is_tx && (is_radio || is_sdr)) {

		/* radio transmitter only ioctls */

		SET_VALID_IOCTL(ops, VIDIOC_G_MODULATOR, vidioc_g_modulator);

		SET_VALID_IOCTL(ops, VIDIOC_S_MODULATOR, vidioc_s_modulator);

	}