于 2013年01月31日 05:25, Hans Verkuil 写道:
> From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
>
> The input and audio ioctls are only valid for video/vbi nodes.
>
> Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
> ---
> drivers/media/usb/tlg2300/pd-radio.c | 27 ---------------------------
> 1 file changed, 27 deletions(-)
>
> diff --git a/drivers/media/usb/tlg2300/pd-radio.c b/drivers/media/usb/tlg2300/pd-radio.c
> index c4feffb..4c76e089 100644
> --- a/drivers/media/usb/tlg2300/pd-radio.c
> +++ b/drivers/media/usb/tlg2300/pd-radio.c
> @@ -350,36 +350,9 @@ static int vidioc_s_tuner(struct file *file, void *priv, struct v4l2_tuner *vt)
> {
> return vt->index > 0 ? -EINVAL : 0;
> }
> -static int vidioc_s_audio(struct file *file, void *priv, const struct v4l2_audio *va)
> -{
> - return (va->index != 0) ? -EINVAL : 0;
> -}
> -
> -static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
> -{
> - a->index = 0;
> - a->mode = 0;
> - a->capability = V4L2_AUDCAP_STEREO;
> - strcpy(a->name, "Radio");
> - return 0;
> -}
> -
> -static int vidioc_s_input(struct file *filp, void *priv, u32 i)
> -{
> - return (i != 0) ? -EINVAL : 0;
> -}
> -
> -static int vidioc_g_input(struct file *filp, void *priv, u32 *i)
> -{
> - return (*i != 0) ? -EINVAL : 0;
> -}
>
> static const struct v4l2_ioctl_ops poseidon_fm_ioctl_ops = {
> .vidioc_querycap = vidioc_querycap,
> - .vidioc_g_audio = vidioc_g_audio,
> - .vidioc_s_audio = vidioc_s_audio,
> - .vidioc_g_input = vidioc_g_input,
> - .vidioc_s_input = vidioc_s_input,
> .vidioc_queryctrl = tlg_fm_vidioc_queryctrl,
> .vidioc_querymenu = tlg_fm_vidioc_querymenu,
> .vidioc_g_ctrl = tlg_fm_vidioc_g_ctrl,
I tested this patch. it seems ok.
thanks.
Acked-by: Huang Shijie <shijie8@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
