From 8df3c767e6193a6f020943f7bb6554660aaf3eda Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 28 Nov 2008 06:44:06 -0300
Subject: [PATCH] --- yaml --- r: 192703 b: refs/heads/master c:
 1f9305b7a56b1c7dd62add13e763b3fc537ae499 h: refs/heads/master i:   192701:
 a596a814e6e491b5ddbf623639e1fbebd8d9b0cd   192699:
 7d5efb08813cde2949171c63a89f86d27143501f   192695:
 75bde456918b1335aec6c7887275f6313f23415e   192687:
 c108b2d449262434ce10237b0d50e56a3bbb98ec   192671:
 9c4c9493886c21425f6cccf3164ef90fc41ddee4   192639:
 557d88f94f967486a86e8bc5077e76dd8a87e293 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/tm6000/tm6000-video.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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;
 	}