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

Commit 47ebe3f9 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] soc-camera: fix compilation breakage in 3 drivers 



A recent commit broke compilation of 3 camera drivers: for PXA2x0, OMAP1
and MX1 by using a wrong pointer. Fix them.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 20e3dbef

drivers/media/platform/soc_camera/mx1_camera.c

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ static void mx1_camera_init_videobuf(struct videobuf_queue *q, 
	videobuf_queue_dma_contig_init(q, &mx1_videobuf_ops, icd->parent,

				&pcdev->lock, V4L2_BUF_TYPE_VIDEO_CAPTURE,

				V4L2_FIELD_NONE,

				sizeof(struct mx1_buffer), icd, &icd->host_lock);

				sizeof(struct mx1_buffer), icd, &ici->host_lock);

}



static int mclk_get_divisor(struct mx1_camera_dev *pcdev)

drivers/media/platform/soc_camera/omap1_camera.c

+2 −2
Original line number Diff line number Diff line
@@ -1383,12 +1383,12 @@ static void omap1_cam_init_videobuf(struct videobuf_queue *q, 
		videobuf_queue_dma_contig_init(q, &omap1_videobuf_ops,

				icd->parent, &pcdev->lock,

				V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,

				sizeof(struct omap1_cam_buf), icd, &icd->host_lock);

				sizeof(struct omap1_cam_buf), icd, &ici->host_lock);

	else

		videobuf_queue_sg_init(q, &omap1_videobuf_ops,

				icd->parent, &pcdev->lock,

				V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,

				sizeof(struct omap1_cam_buf), icd, &icd->host_lock);

				sizeof(struct omap1_cam_buf), icd, &ici->host_lock);



	/* use videobuf mode (auto)selected with the module parameter */

	pcdev->vb_mode = sg_mode ? OMAP1_CAM_DMA_SG : OMAP1_CAM_DMA_CONTIG;

drivers/media/platform/soc_camera/pxa_camera.c

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ static void pxa_camera_init_videobuf(struct videobuf_queue *q, 
	 */

	videobuf_queue_sg_init(q, &pxa_videobuf_ops, NULL, &pcdev->lock,

				V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,

				sizeof(struct pxa_buffer), icd, &icd->host_lock);

				sizeof(struct pxa_buffer), icd, &ici->host_lock);

}



static u32 mclk_get_divisor(struct platform_device *pdev,