diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2013-01-30 07:25:25 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-08 11:57:14 -0500 |
commit | 47ebe3f93250fce6f4eaa16309ae5eee9d4099b3 (patch) | |
tree | 4d138255379beacbc240e292557b71acd9ec3c3b /drivers/media | |
parent | 20e3dbef8e7acf679ba179e1a077303e3f76f975 (diff) |
[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: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/platform/soc_camera/mx1_camera.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/soc_camera/omap1_camera.c | 4 | ||||
-rw-r--r-- | drivers/media/platform/soc_camera/pxa_camera.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/soc_camera/mx1_camera.c b/drivers/media/platform/soc_camera/mx1_camera.c index 4b661e87d8b1..25b2a285dc86 100644 --- a/drivers/media/platform/soc_camera/mx1_camera.c +++ b/drivers/media/platform/soc_camera/mx1_camera.c | |||
@@ -372,7 +372,7 @@ static void mx1_camera_init_videobuf(struct videobuf_queue *q, | |||
372 | videobuf_queue_dma_contig_init(q, &mx1_videobuf_ops, icd->parent, | 372 | videobuf_queue_dma_contig_init(q, &mx1_videobuf_ops, icd->parent, |
373 | &pcdev->lock, V4L2_BUF_TYPE_VIDEO_CAPTURE, | 373 | &pcdev->lock, V4L2_BUF_TYPE_VIDEO_CAPTURE, |
374 | V4L2_FIELD_NONE, | 374 | V4L2_FIELD_NONE, |
375 | sizeof(struct mx1_buffer), icd, &icd->host_lock); | 375 | sizeof(struct mx1_buffer), icd, &ici->host_lock); |
376 | } | 376 | } |
377 | 377 | ||
378 | static int mclk_get_divisor(struct mx1_camera_dev *pcdev) | 378 | static int mclk_get_divisor(struct mx1_camera_dev *pcdev) |
diff --git a/drivers/media/platform/soc_camera/omap1_camera.c b/drivers/media/platform/soc_camera/omap1_camera.c index dcf7be814776..2547bf88f79f 100644 --- a/drivers/media/platform/soc_camera/omap1_camera.c +++ b/drivers/media/platform/soc_camera/omap1_camera.c | |||
@@ -1383,12 +1383,12 @@ static void omap1_cam_init_videobuf(struct videobuf_queue *q, | |||
1383 | videobuf_queue_dma_contig_init(q, &omap1_videobuf_ops, | 1383 | videobuf_queue_dma_contig_init(q, &omap1_videobuf_ops, |
1384 | icd->parent, &pcdev->lock, | 1384 | icd->parent, &pcdev->lock, |
1385 | V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, | 1385 | V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, |
1386 | sizeof(struct omap1_cam_buf), icd, &icd->host_lock); | 1386 | sizeof(struct omap1_cam_buf), icd, &ici->host_lock); |
1387 | else | 1387 | else |
1388 | videobuf_queue_sg_init(q, &omap1_videobuf_ops, | 1388 | videobuf_queue_sg_init(q, &omap1_videobuf_ops, |
1389 | icd->parent, &pcdev->lock, | 1389 | icd->parent, &pcdev->lock, |
1390 | V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, | 1390 | V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, |
1391 | sizeof(struct omap1_cam_buf), icd, &icd->host_lock); | 1391 | sizeof(struct omap1_cam_buf), icd, &ici->host_lock); |
1392 | 1392 | ||
1393 | /* use videobuf mode (auto)selected with the module parameter */ | 1393 | /* use videobuf mode (auto)selected with the module parameter */ |
1394 | pcdev->vb_mode = sg_mode ? OMAP1_CAM_DMA_SG : OMAP1_CAM_DMA_CONTIG; | 1394 | pcdev->vb_mode = sg_mode ? OMAP1_CAM_DMA_SG : OMAP1_CAM_DMA_CONTIG; |
diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c index 1fbec5202e4f..9c97f7e985e1 100644 --- a/drivers/media/platform/soc_camera/pxa_camera.c +++ b/drivers/media/platform/soc_camera/pxa_camera.c | |||
@@ -842,7 +842,7 @@ static void pxa_camera_init_videobuf(struct videobuf_queue *q, | |||
842 | */ | 842 | */ |
843 | videobuf_queue_sg_init(q, &pxa_videobuf_ops, NULL, &pcdev->lock, | 843 | videobuf_queue_sg_init(q, &pxa_videobuf_ops, NULL, &pcdev->lock, |
844 | V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, | 844 | V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, |
845 | sizeof(struct pxa_buffer), icd, &icd->host_lock); | 845 | sizeof(struct pxa_buffer), icd, &ici->host_lock); |
846 | } | 846 | } |
847 | 847 | ||
848 | static u32 mclk_get_divisor(struct platform_device *pdev, | 848 | static u32 mclk_get_divisor(struct platform_device *pdev, |