---

yaml --- r: 192703 b: refs/heads/master c: 1f9305b h: refs/heads/master i: 192701: a596a81 192699: 7d5efb0 192695: 75bde45 192687: c108b2d 192671: 9c4c949 192639: 557d88f v: v3
git-mirror · May 18, 2010 · 8df3c76 · 8df3c76
1 parent 6dc1299
commit 8df3c76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     	if (list_empty(&dma_q->active)) {
     		dprintk(dev, V4L2_DEBUG_QUEUE, "No active queue to serve\n");
+    		*buf = NULL;
     		return;
     	}
@@ Expand Down @@