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

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

[media] em28xx: remove bogus input/audio ioctls for the radio device 



Radio devices should not implement those ioctls.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a9d79fe5

drivers/media/usb/em28xx/em28xx-video.c

+0 −35
Original line number Diff line number Diff line
@@ -1856,26 +1856,6 @@ static int radio_g_tuner(struct file *file, void *priv, 
	return 0;

}



static int radio_enum_input(struct file *file, void *priv,

			    struct v4l2_input *i)

{

	if (i->index != 0)

		return -EINVAL;

	strcpy(i->name, "Radio");

	i->type = V4L2_INPUT_TYPE_TUNER;



	return 0;

}



static int radio_g_audio(struct file *file, void *priv, struct v4l2_audio *a)

{

	if (unlikely(a->index))

		return -EINVAL;



	strcpy(a->name, "Radio");

	return 0;

}



static int radio_s_tuner(struct file *file, void *priv,

			 struct v4l2_tuner *t)

{
@@ -1889,17 +1869,6 @@ static int radio_s_tuner(struct file *file, void *priv, 
	return 0;

}



static int radio_s_audio(struct file *file, void *fh,

			 const struct v4l2_audio *a)

{

	return 0;

}



static int radio_s_input(struct file *file, void *fh, unsigned int i)

{

	return 0;

}



static int radio_queryctrl(struct file *file, void *priv,

			   struct v4l2_queryctrl *qc)

{
@@ -2279,11 +2248,7 @@ static const struct v4l2_file_operations radio_fops = { 
static const struct v4l2_ioctl_ops radio_ioctl_ops = {

	.vidioc_querycap      = vidioc_querycap,

	.vidioc_g_tuner       = radio_g_tuner,

	.vidioc_enum_input    = radio_enum_input,

	.vidioc_g_audio       = radio_g_audio,

	.vidioc_s_tuner       = radio_s_tuner,

	.vidioc_s_audio       = radio_s_audio,

	.vidioc_s_input       = radio_s_input,

	.vidioc_queryctrl     = radio_queryctrl,

	.vidioc_g_ctrl        = vidioc_g_ctrl,

	.vidioc_s_ctrl        = vidioc_s_ctrl,