diff options
| author | Ricardo Ribalda <ribalda@chromium.org> | 2021-10-07 00:26:22 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-10-08 13:41:23 +0200 |
| commit | ea2b9a33711604e91f8c826f4dcb3c12baa1990a (patch) | |
| tree | e64ef9d80c3cbb5d29825345901b6032c207bb77 /drivers/staging/media/ipu3 | |
| parent | 553481e38045f349bb9aa596d03bebd020020c9c (diff) | |
| download | linux-ea2b9a33711604e91f8c826f4dcb3c12baa1990a.tar.bz2 | |
media: ipu3-imgu: VIDIOC_QUERYCAP: Fix bus_info
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'
Reviewed-by: Bingbu Cao <bingbu.cao@intel.com>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media/ipu3')
| -rw-r--r-- | drivers/staging/media/ipu3/ipu3-v4l2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c index 69ef820619ab..0473457b4e64 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; } |