---

yaml --- r: 242188 b: refs/heads/master c: d6db5bf h: refs/heads/master v: v3
git-mirror · Mar 22, 2011 · b625efa · b625efa
1 parent e488f71
commit b625efa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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) {