Commit 457e7911 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Suggested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 9b31ea80

drivers/media/usb/uvc/uvc_metadata.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int uvc_meta_v4l2_querycap(struct file *file, void *fh, 
	struct uvc_video_chain *chain = stream->chain;



	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));

	cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING

			  | chain->caps;

drivers/media/usb/uvc/uvc_v4l2.c

+1 −2
Original line number Diff line number Diff line
@@ -617,13 +617,12 @@ static int uvc_v4l2_release(struct file *file) 
static int uvc_ioctl_querycap(struct file *file, void *fh,

			      struct v4l2_capability *cap)

{

	struct video_device *vdev = video_devdata(file);

	struct uvc_fh *handle = file->private_data;

	struct uvc_video_chain *chain = handle->chain;

	struct uvc_streaming *stream = handle->stream;



	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));

	cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING

			  | chain->caps;