diff --git a/[refs] b/[refs]
index b98386b0422b..774968719e34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edecce0a31b4447ee75dd0df34c7c5fc90ba6f6b
+refs/heads/master: 1f9305b7a56b1c7dd62add13e763b3fc537ae499
diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c
index 125cb368dfe5..3723d832879b 100644
--- a/trunk/drivers/staging/tm6000/tm6000-video.c
+++ b/trunk/drivers/staging/tm6000/tm6000-video.c
@@ -139,6 +139,7 @@ static inline void get_next_buf(struct tm6000_dmaqueue *dma_q,
 
 	if (list_empty(&dma_q->active)) {
 		dprintk(dev, V4L2_DEBUG_QUEUE, "No active queue to serve\n");
+		*buf = NULL;
 		return;
 	}