Re: [PATCH 4/7] media: ipu3-cio2: VIDIOC_QUERYCAP: Fix bus_info

From: Bingbu Cao
Date: Tue Sep 28 2021 - 20:58:47 EST


Besides the subject,

Reviewed-by: Bingbu Cao <bingbu.cao@xxxxxxxxx>

On 9/29/21 5:10 AM, Ricardo Ribalda wrote:
> bus_info field had a different value for the media entity and the video
> device.
>
> Fixes v4l2-compliance:
>
> v4l2-compliance.cpp(637): media bus_info 'PCI:0000:00:05.0' differs from
> V4L2 bus_info 'PCI:viewfinder'
>
> Signed-off-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
> ---
> drivers/staging/media/ipu3/ipu3-v4l2.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c
> index 66995c6f15808..2594ac4eb0763 100644
> --- a/drivers/staging/media/ipu3/ipu3-v4l2.c
> +++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
> @@ -592,11 +592,12 @@ static const struct imgu_fmt *find_format(struct v4l2_format *f, u32 type)
> static int imgu_vidioc_querycap(struct file *file, void *fh,
> struct v4l2_capability *cap)
> {
> - struct imgu_video_device *node = file_to_intel_imgu_node(file);
> + struct imgu_device *imgu = video_drvdata(file);
>
> strscpy(cap->driver, IMGU_NAME, sizeof(cap->driver));
> strscpy(cap->card, IMGU_NAME, sizeof(cap->card));
> - snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s", node->name);
> + snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s",
> + pci_name(imgu->pci_dev));
>
> return 0;
> }
>

--
Best regards,
Bingbu Cao