Messages in this thread | | | Subject | Re: [PATCH v5 07/13] media: uvcvideo: Use dev->name for querycap() | From | Hans Verkuil <> | Date | Wed, 17 Mar 2021 11:57:18 +0100 |
| |
On 16/03/2021 18:59, Ricardo Ribalda wrote: > Use the device name for the card name instead of cap->card.
You mean: 'instead of vdev->name.' ?
> > Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> > --- > drivers/media/usb/uvc/uvc_v4l2.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c > index e956d833ed84..d780065f3716 100644 > --- a/drivers/media/usb/uvc/uvc_v4l2.c > +++ b/drivers/media/usb/uvc/uvc_v4l2.c > @@ -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));
I don't think this is right. I get this for the video node:
Card type : Integrated IR Camera: Integrate
and this for the corresponding metadata node:
Card type : Metadata 7
But they are the same device, so I expect the same text here.
Regards,
Hans
> usb_make_path(stream->dev->udev, cap->bus_info, sizeof(cap->bus_info)); > cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING > | chain->caps; >
| |