From 6aafc1663cb0fa3269b6ad0f1c1cf24104e87490 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 24 Apr 2012 19:12:48 -0300
Subject: [PATCH] --- yaml --- r: 300252 b: refs/heads/master c:
 8106a3908157e753ce8409c33ef8f2d90be58d9b h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/video/videobuf2-dma-contig.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a4e40f5ef320..63ec0e2ec367 100644
--- 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
index f17ad98fcc5f..7de6843a1928 100644
--- 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;
 }