---

yaml --- r: 300252 b: refs/heads/master c: 8106a39 h: refs/heads/master v: v3
git-mirror · May 8, 2012 · 6aafc16 · 6aafc16
1 parent 6854e4c
commit 6aafc16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43c286023ee19fe7a697d6c1ac5453a3ef4452a6
+refs/heads/master: 8106a3908157e753ce8409c33ef8f2d90be58d9b
diff --git a/trunk/drivers/media/video/videobuf2-dma-contig.c b/trunk/drivers/media/video/videobuf2-dma-contig.c
@@ -85,7 +85,7 @@ static void *vb2_dma_contig_vaddr(void *buf_priv)
 {
 	struct vb2_dc_buf *buf = buf_priv;
 	if (!buf)
-		return 0;
+		return NULL;
 
 	return buf->vaddr;
 }