---

yaml --- r: 211353 b: refs/heads/master c: b2b476f h: refs/heads/master i: 211351: 07f2abc v: v3
git-mirror · Sep 30, 2010 · 1b02c65 · 1b02c65
1 parent 080fa11
commit 1b02c65
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a08c7c68f702e2a2797a4035b6c0a756c4886c26
+refs/heads/master: b2b476f53a9d24b00a313adf7f6ca92515a2af54
diff --git a/trunk/drivers/media/video/videobuf-dma-contig.c b/trunk/drivers/media/video/videobuf-dma-contig.c
@@ -393,8 +393,10 @@ void videobuf_dma_contig_free(struct videobuf_queue *q,
 	}
 
 	/* read() method */
-	dma_free_coherent(q->dev, mem->size, mem->vaddr, mem->dma_handle);
-	mem->vaddr = NULL;
+	if (mem->vaddr) {
+		dma_free_coherent(q->dev, mem->size, mem->vaddr, mem->dma_handle);
+		mem->vaddr = NULL;
+	}
 }
 EXPORT_SYMBOL_GPL(videobuf_dma_contig_free);