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

Commit b7b68393 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] marvell-ccic: fill in bus_info 



The bus_info field of struct v4l2_querycap wasn't filled in and
v4l2-compliance complained about that. Fix this.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarJonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 17d3675a

drivers/media/platform/marvell-ccic/cafe-driver.c

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ static int cafe_pci_probe(struct pci_dev *pdev, 
	mcam->plat_power_up = cafe_ctlr_power_up;

	mcam->plat_power_down = cafe_ctlr_power_down;

	mcam->dev = &pdev->dev;

	snprintf(mcam->bus_info, sizeof(mcam->bus_info), "PCI:%s", pci_name(pdev));

	/*

	 * Set the clock speed for the XO 1; I don't believe this

	 * driver has ever run anywhere else.

drivers/media/platform/marvell-ccic/mcam-core.c

+3 −0
Original line number Diff line number Diff line
@@ -1388,8 +1388,11 @@ static int mcam_vidioc_dqbuf(struct file *filp, void *priv, 
static int mcam_vidioc_querycap(struct file *file, void *priv,

		struct v4l2_capability *cap)

{

	struct mcam_camera *cam = priv;



	strcpy(cap->driver, "marvell_ccic");

	strcpy(cap->card, "marvell_ccic");

	strlcpy(cap->bus_info, cam->bus_info, sizeof(cap->bus_info));

	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |

		V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;

drivers/media/platform/marvell-ccic/mcam-core.h

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ struct mcam_camera { 
	unsigned int nbufs;		/* How many are alloc'd */

	int next_buf;			/* Next to consume (dev_lock) */



	char bus_info[32];		/* querycap bus_info */



	/* DMA buffers - vmalloc mode */

#ifdef MCAM_MODE_VMALLOC

	unsigned int dma_buf_size;	/* allocated size */

drivers/media/platform/marvell-ccic/mmp-driver.c

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ static int mmpcam_probe(struct platform_device *pdev) 
	mcam->lane = pdata->lane;

	mcam->chip_id = MCAM_ARMADA610;

	mcam->buffer_mode = B_DMA_sg;

	strlcpy(mcam->bus_info, "platform:mmp-camera", sizeof(mcam->bus_info));

	spin_lock_init(&mcam->dev_lock);

	/*

	 * Get our I/O memory.