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

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

[media] em28xx: fix querycap 



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 3ac693c4

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

+19 −23
Original line number Diff line number Diff line
@@ -1577,6 +1577,7 @@ static int vidioc_streamoff(struct file *file, void *priv, 
static int vidioc_querycap(struct file *file, void  *priv,

					struct v4l2_capability *cap)

{

	struct video_device *vdev = video_devdata(file);

	struct em28xx_fh      *fh  = priv;

	struct em28xx         *dev = fh->dev;
@@ -1584,20 +1585,28 @@ static int vidioc_querycap(struct file *file, void *priv, 
	strlcpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card));

	usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));



	cap->capabilities =

			V4L2_CAP_SLICED_VBI_CAPTURE |

			V4L2_CAP_VIDEO_CAPTURE |

			V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;



	if (dev->vbi_dev)

		cap->capabilities |= V4L2_CAP_VBI_CAPTURE;

	if (vdev->vfl_type == VFL_TYPE_GRABBER)

		cap->device_caps = V4L2_CAP_READWRITE |

			V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	else if (vdev->vfl_type == VFL_TYPE_RADIO)

		cap->device_caps = V4L2_CAP_RADIO;

	else

		cap->device_caps = V4L2_CAP_READWRITE |

			V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE;



	if (dev->audio_mode.has_audio)

		cap->capabilities |= V4L2_CAP_AUDIO;

		cap->device_caps |= V4L2_CAP_AUDIO;



	if (dev->tuner_type != TUNER_ABSENT)

		cap->capabilities |= V4L2_CAP_TUNER;

		cap->device_caps |= V4L2_CAP_TUNER;



	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS |

		V4L2_CAP_READWRITE | V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	if (dev->vbi_dev)

		cap->capabilities |=

			V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE;

	if (dev->radio_dev)

		cap->capabilities |= V4L2_CAP_RADIO;

	return 0;

}
@@ -1831,19 +1840,6 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b) 
/* RADIO ESPECIFIC IOCTLS                                      */

/* ----------------------------------------------------------- */



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

			  struct v4l2_capability *cap)

{

	struct em28xx *dev = ((struct em28xx_fh *)priv)->dev;



	strlcpy(cap->driver, "em28xx", sizeof(cap->driver));

	strlcpy(cap->card, em28xx_boards[dev->model].name, sizeof(cap->card));

	usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));



	cap->capabilities = V4L2_CAP_TUNER;

	return 0;

}



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

			 struct v4l2_tuner *t)

{
@@ -2281,7 +2277,7 @@ static const struct v4l2_file_operations radio_fops = { 
};



static const struct v4l2_ioctl_ops radio_ioctl_ops = {

	.vidioc_querycap      = radio_querycap,

	.vidioc_querycap      = vidioc_querycap,

	.vidioc_g_tuner       = radio_g_tuner,

	.vidioc_enum_input    = radio_enum_input,

	.vidioc_g_audio       = radio_g_audio,