diff --git a/[refs] b/[refs]
index 7b0fe8a921bc..94fb74ebf5d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0df3c384766b11ca118ceac9a3acdc0d76239b1
+refs/heads/master: 121b3ddbe4ad17df77cb7284239be0a63d9a66bd
diff --git a/trunk/drivers/media/video/videobuf2-dma-contig.c b/trunk/drivers/media/video/videobuf2-dma-contig.c
index a1bee6c0b31d..4b7132660a93 100644
--- a/trunk/drivers/media/video/videobuf2-dma-contig.c
+++ b/trunk/drivers/media/video/videobuf2-dma-contig.c
@@ -86,7 +86,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;
 }