mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
media: uvcvideo: Use dev->name for querycap()
Use the device name for the card name instead of vdev->name. That way all the devices have a different name instead of the common vdev->name. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
parent
9b31ea808a
commit
457e7911df
2 changed files with 2 additions and 3 deletions
|
@ -30,7 +30,7 @@ static int uvc_meta_v4l2_querycap(struct file *file, void *fh,
|
||||||
struct uvc_video_chain *chain = stream->chain;
|
struct uvc_video_chain *chain = stream->chain;
|
||||||
|
|
||||||
strscpy(cap->driver, "uvcvideo", sizeof(cap->driver));
|
strscpy(cap->driver, "uvcvideo", sizeof(cap->driver));
|
||||||
strscpy(cap->card, vfh->vdev->name, sizeof(cap->card));
|
strscpy(cap->card, stream->dev->name, sizeof(cap->card));
|
||||||
usb_make_path(stream->dev->udev, cap->bus_info, sizeof(cap->bus_info));
|
usb_make_path(stream->dev->udev, cap->bus_info, sizeof(cap->bus_info));
|
||||||
cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING
|
cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING
|
||||||
| chain->caps;
|
| chain->caps;
|
||||||
|
|
|
@ -617,13 +617,12 @@ static int uvc_v4l2_release(struct file *file)
|
||||||
static int uvc_ioctl_querycap(struct file *file, void *fh,
|
static int uvc_ioctl_querycap(struct file *file, void *fh,
|
||||||
struct v4l2_capability *cap)
|
struct v4l2_capability *cap)
|
||||||
{
|
{
|
||||||
struct video_device *vdev = video_devdata(file);
|
|
||||||
struct uvc_fh *handle = file->private_data;
|
struct uvc_fh *handle = file->private_data;
|
||||||
struct uvc_video_chain *chain = handle->chain;
|
struct uvc_video_chain *chain = handle->chain;
|
||||||
struct uvc_streaming *stream = handle->stream;
|
struct uvc_streaming *stream = handle->stream;
|
||||||
|
|
||||||
strscpy(cap->driver, "uvcvideo", sizeof(cap->driver));
|
strscpy(cap->driver, "uvcvideo", sizeof(cap->driver));
|
||||||
strscpy(cap->card, vdev->name, sizeof(cap->card));
|
strscpy(cap->card, handle->stream->dev->name, sizeof(cap->card));
|
||||||
usb_make_path(stream->dev->udev, cap->bus_info, sizeof(cap->bus_info));
|
usb_make_path(stream->dev->udev, cap->bus_info, sizeof(cap->bus_info));
|
||||||
cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING
|
cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING
|
||||||
| chain->caps;
|
| chain->caps;
|
||||||
|
|
Loading…
Reference in a new issue