On 10/14/19 11:43 PM, Laurent Pinchart wrote:
> Hi Hans,
>
> Thank you for the patch.
>
> On Mon, Oct 14, 2019 at 02:01:05PM +0200, Hans Verkuil wrote:
>> Touch devices have obviously no tuner, so don't attempt to enable those
>> ioctls
>> for such devices.
>
> Shouldn't this be disabled for pure metadata devices (is_meta &&
> !is_vid) too ?
No. It doesn't matter for this whether metadata is a separate or combined
device,
in both cases a meta device can be connected to a source that is controlled via
a tuner.
Regards,
Hans
>
>> Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl>
>> ---
>> diff --git a/drivers/media/v4l2-core/v4l2-dev.c
>> b/drivers/media/v4l2-core/v4l2-dev.c
>> index cec588b04711..da42d172714a 100644
>> --- a/drivers/media/v4l2-core/v4l2-dev.c
>> +++ b/drivers/media/v4l2-core/v4l2-dev.c
>> @@ -581,8 +581,10 @@ static void determine_valid_ioctls(struct video_device
>> *vdev)
>> set_bit(_IOC_NR(VIDIOC_TRY_EXT_CTRLS), valid_ioctls);
>> if (vdev->ctrl_handler || ops->vidioc_querymenu)
>> set_bit(_IOC_NR(VIDIOC_QUERYMENU), valid_ioctls);
>> - SET_VALID_IOCTL(ops, VIDIOC_G_FREQUENCY, vidioc_g_frequency);
>> - SET_VALID_IOCTL(ops, VIDIOC_S_FREQUENCY, vidioc_s_frequency);
>> + if (!is_tch) {
>> + SET_VALID_IOCTL(ops, VIDIOC_G_FREQUENCY, vidioc_g_frequency);
>> + SET_VALID_IOCTL(ops, VIDIOC_S_FREQUENCY, vidioc_s_frequency);
>> + }
>> SET_VALID_IOCTL(ops, VIDIOC_LOG_STATUS, vidioc_log_status);
>> #ifdef CONFIG_VIDEO_ADV_DEBUG
>> set_bit(_IOC_NR(VIDIOC_DBG_G_CHIP_INFO), valid_ioctls);
>> @@ -754,7 +756,7 @@ static void determine_valid_ioctls(struct video_device
>> *vdev)
>> SET_VALID_IOCTL(ops, VIDIOC_G_MODULATOR, vidioc_g_modulator);
>> SET_VALID_IOCTL(ops, VIDIOC_S_MODULATOR, vidioc_s_modulator);
>> }
>> - if (is_rx) {
>> + if (is_rx && !is_tch) {
>> /* receiver only ioctls */
>> SET_VALID_IOCTL(ops, VIDIOC_G_TUNER, vidioc_g_tuner);
>> SET_VALID_IOCTL(ops, VIDIOC_S_TUNER, vidioc_s_tuner);
>>
>
