aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Osciak <pawel@osciak.com>2011-03-14 10:38:23 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 19:41:57 -0300
commitd6db5bfe7fd6d4334a1460923ba8175f1a0ece2d (patch)
tree198384131bc7f476924cc86fd156ac8de2f94de6
parentd366d4a08a4e5e1fddc2cc820302be8e7a8143d4 (diff)
downloadkernel_samsung_smdk4412-d6db5bfe7fd6d4334a1460923ba8175f1a0ece2d.zip
kernel_samsung_smdk4412-d6db5bfe7fd6d4334a1460923ba8175f1a0ece2d.tar.gz
kernel_samsung_smdk4412-d6db5bfe7fd6d4334a1460923ba8175f1a0ece2d.tar.bz2
[media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
Use vb2_dma_contig_plane_paddr to retrieve a physical address for a plane instead of calling an internal mem_ops callback. Signed-off-by: Pawel Osciak <pawel@osciak.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/sh_mobile_ceu_camera.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c
index 61f3701..3fe54bf 100644
--- a/drivers/media/video/sh_mobile_ceu_camera.c
+++ b/drivers/media/video/sh_mobile_ceu_camera.c
@@ -302,9 +302,7 @@ static int sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev)
bottom2 = CDBCR;
}
- /* mem_ops->cookie must not be NULL */
- phys_addr_top = (dma_addr_t)icd->vb2_vidq.mem_ops->cookie(pcdev->
- active->planes[0].mem_priv);
+ phys_addr_top = vb2_dma_contig_plane_paddr(pcdev->active, 0);
ceu_write(pcdev, top1, phys_addr_top);
if (V4L2_FIELD_NONE != pcdev->field) {