Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 382e7b64 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Greg Kroah-Hartman
Browse files

media: ipu3-imgu: VIDIOC_QUERYCAP: Fix bus_info 



[ Upstream commit ea2b9a33711604e91f8c826f4dcb3c12baa1990a ]

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: default avatarBingbu Cao <bingbu.cao@intel.com>
Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e5f9be48

drivers/staging/media/ipu3/ipu3-v4l2.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -594,11 +594,12 @@ static const struct imgu_fmt *find_format(struct v4l2_format *f, u32 type) 
static int imgu_vidioc_querycap(struct file *file, void *fh,

static int imgu_vidioc_querycap(struct file *file, void *fh,

				struct v4l2_capability *cap)

				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->driver, IMGU_NAME, sizeof(cap->driver));

	strscpy(cap->card, IMGU_NAME, sizeof(cap->card));

	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;

	return 0;

}

}