From b625efa475b0650663c69779be9ed05f02cb2a06 Mon Sep 17 00:00:00 2001 From: Pawel Osciak Date: Mon, 14 Mar 2011 10:38:23 -0300 Subject: [PATCH] --- yaml --- r: 242188 b: refs/heads/master c: d6db5bfe7fd6d4334a1460923ba8175f1a0ece2d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/sh_mobile_ceu_camera.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0f8c8c075c38..679fb2af2d8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d366d4a08a4e5e1fddc2cc820302be8e7a8143d4 +refs/heads/master: d6db5bfe7fd6d4334a1460923ba8175f1a0ece2d diff --git a/trunk/drivers/media/video/sh_mobile_ceu_camera.c b/trunk/drivers/media/video/sh_mobile_ceu_camera.c index 61f37012b4f8..3fe54bf41142 100644 --- a/trunk/drivers/media/video/sh_mobile_ceu_camera.c +++ b/trunk/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) {