---

yaml --- r: 366837 b: refs/heads/master c: f43afb1 h: refs/heads/master i: 366835: 5502749 v: v3
git-mirror · Mar 25, 2013 · e78632b · e78632b
1 parent 370b707
commit e78632b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff82ad223d386aa588948931dac5d61f4dae3cfb
+refs/heads/master: f43afb1e21ff31243e120401ff34f017d0818998
diff --git a/trunk/drivers/staging/media/solo6x10/p2m.c b/trunk/drivers/staging/media/solo6x10/p2m.c
@@ -52,6 +52,8 @@ int solo_p2m_dma(struct solo_dev *solo_dev, int wr,
 
 	dma_addr = pci_map_single(solo_dev->pdev, sys_addr, size,
 				  wr ? PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE);
+	if (pci_dma_mapping_error(solo_dev->pdev, dma_addr))
+		return -ENOMEM;
 
 	ret = solo_p2m_dma_t(solo_dev, wr, dma_addr, ext_addr, size,
 			     repeat, ext_size);