From 9f80a82ab524e2019a3111ab8801057867eed65c Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 24 Apr 2012 19:12:48 -0300 Subject: [PATCH] --- yaml --- r: 306269 b: refs/heads/master c: 121b3ddbe4ad17df77cb7284239be0a63d9a66bd h: refs/heads/master i: 306267: fa83bf9e6aa9b317f65c0ba136f897b9b4b81eb5 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 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; }