diff --git a/[refs] b/[refs]
index 58e2dca9f6c6..4bc987ca3acf 100644
--- 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
index b3a933906b90..a77c8d9ed0bf 100644
--- 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);