From e628c6b735a72c53f3969cea5091e741c46781df Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@tuxdriver.com>
Date: Thu, 13 Jun 2013 15:31:28 -0400
Subject: [PATCH] --- yaml --- r: 377136 b: refs/heads/master c:
 c9bfbb31af7c8428267b34eb9706a621ac219a28 h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/ethernet/dec/tulip/interrupt.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e15e39af43ca..661077e0cb7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd019897358b815f7828dab90b51d51df4d3658d
+refs/heads/master: c9bfbb31af7c8428267b34eb9706a621ac219a28
diff --git a/trunk/drivers/net/ethernet/dec/tulip/interrupt.c b/trunk/drivers/net/ethernet/dec/tulip/interrupt.c
index 28a5e425fecf..92306b320840 100644
--- a/trunk/drivers/net/ethernet/dec/tulip/interrupt.c
+++ b/trunk/drivers/net/ethernet/dec/tulip/interrupt.c
@@ -76,6 +76,12 @@ int tulip_refill_rx(struct net_device *dev)
 
 			mapping = pci_map_single(tp->pdev, skb->data, PKT_BUF_SZ,
 						 PCI_DMA_FROMDEVICE);
+			if (dma_mapping_error(&tp->pdev->dev, mapping)) {
+				dev_kfree_skb(skb);
+				tp->rx_buffers[entry].skb = NULL;
+				break;
+			}
+
 			tp->rx_buffers[entry].mapping = mapping;
 
 			tp->rx_ring[entry].buffer1 = cpu_to_le32(mapping);