---

yaml --- r: 348729 b: refs/heads/master c: 0d826c3 h: refs/heads/master i: 348727: 49e52f4 v: v3
git-mirror · Jan 7, 2013 · 7cc7836 · 7cc7836
1 parent 9a428a0
commit 7cc7836
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efe57d5977fa62b8fdf3a38c236d1aa5351228be
+refs/heads/master: 0d826c3919ceede3c6afc3e87fc7087e0c863e7e
diff --git a/trunk/drivers/staging/rtl8187se/r8180_core.c b/trunk/drivers/staging/rtl8187se/r8180_core.c
@@ -937,7 +937,8 @@ short alloc_rx_desc_ring(struct net_device *dev, u16 bufsize, int count)
 
 		dma_tmp = pci_map_single(pdev, buf, bufsize * sizeof(u8),
 					 PCI_DMA_FROMDEVICE);
-
+		if (pci_dma_mapping_error(pdev, dma_tmp))
+			return -1;
 		if (-1 == buffer_add(&(priv->rxbuffer), buf, dma_tmp,
 			   &(priv->rxbufferhead))) {
 			DMESGE("Unable to allocate mem RX buf");