From 57a177e21177248ee26e181b84e27ec4c2479132 Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Wed, 12 Oct 2011 13:09:53 -0300
Subject: [PATCH] --- yaml --- r: 275362 b: refs/heads/master c:
 2c2dd6ac738d8a22def46e073fb7383cac8fa180 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ce9205911e3b..af345f8d09f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e836a1c078e230dd5a94bb086b186c2be3ec6a84
+refs/heads/master: 2c2dd6ac738d8a22def46e073fb7383cac8fa180
diff --git a/trunk/drivers/media/video/videobuf2-core.c b/trunk/drivers/media/video/videobuf2-core.c
index 979e544388cb..9bb92145ad5a 100644
--- a/trunk/drivers/media/video/videobuf2-core.c
+++ b/trunk/drivers/media/video/videobuf2-core.c
@@ -296,14 +296,14 @@ static bool __buffer_in_use(struct vb2_queue *q, struct vb2_buffer *vb)
 {
 	unsigned int plane;
 	for (plane = 0; plane < vb->num_planes; ++plane) {
+		void *mem_priv = vb->planes[plane].mem_priv;
 		/*
 		 * If num_users() has not been provided, call_memop
 		 * will return 0, apparently nobody cares about this
 		 * case anyway. If num_users() returns more than 1,
 		 * we are not the only user of the plane's memory.
 		 */
-		if (call_memop(q, plane, num_users,
-				vb->planes[plane].mem_priv) > 1)
+		if (mem_priv && call_memop(q, plane, num_users, mem_priv) > 1)
 			return true;
 	}
 	return false;