From dfa8b52297322cc0ef5b4d32b9343f9c1f9c1b39 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 8 Jan 2012 13:55:23 +0000
Subject: [PATCH] --- yaml --- r: 296315 b: refs/heads/master c:
 22f0bf96de1506081a8b18ad3e0d04d5add70a4a h: refs/heads/master i:   296313:
 e0c7452771a437d819556e0889ace726c20375c1   296311:
 10e09923dee9f48fd8950044ee3022e7c5b1c805 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/net/irda/sa1100_ir.c | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index eedc9082e7b6..04c869a21078 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15877e9c8a12ced38ac31d8bf4f93f3634fbea3f
+refs/heads/master: 22f0bf96de1506081a8b18ad3e0d04d5add70a4a
diff --git a/trunk/drivers/net/irda/sa1100_ir.c b/trunk/drivers/net/irda/sa1100_ir.c
index 751f2a9f283b..84fecce078f6 100644
--- a/trunk/drivers/net/irda/sa1100_ir.c
+++ b/trunk/drivers/net/irda/sa1100_ir.c
@@ -82,7 +82,6 @@ static int sa1100_irda_rx_alloc(struct sa1100_irda *si)
 		return 0;
 
 	si->rxskb = alloc_skb(HPSIR_MAX_RXLEN + 1, GFP_ATOMIC);
-
 	if (!si->rxskb) {
 		printk(KERN_ERR "sa1100_ir: out of memory for RX SKB\n");
 		return -ENOMEM;
@@ -97,6 +96,11 @@ static int sa1100_irda_rx_alloc(struct sa1100_irda *si)
 	si->rxbuf_dma = dma_map_single(si->dev, si->rxskb->data,
 					HPSIR_MAX_RXLEN,
 					DMA_FROM_DEVICE);
+	if (dma_mapping_error(si->dev, si->rxbuf_dma)) {
+		dev_kfree_skb_any(si->rxskb);
+		return -ENOMEM;
+	}
+
 	return 0;
 }
 
@@ -518,7 +522,8 @@ static void sa1100_irda_fir_error(struct sa1100_irda *si, struct net_device *dev
 		netif_rx(skb);
 	} else {
 		/*
-		 * Remap the buffer.
+		 * Remap the buffer - it was previously mapped, and we
+		 * hope that this succeeds.
 		 */
 		si->rxbuf_dma = dma_map_single(si->dev, si->rxskb->data,
 						HPSIR_MAX_RXLEN,
@@ -701,6 +706,13 @@ static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
 		si->txskb = skb;
 		si->txbuf_dma = dma_map_single(si->dev, skb->data,
 					 skb->len, DMA_TO_DEVICE);
+		if (dma_mapping_error(si->dev, si->txbuf_dma)) {
+			si->txskb = NULL;
+			netif_wake_queue(dev);
+			dev->stats.tx_dropped++;
+			dev_kfree_skb(skb);
+			return NETDEV_TX_OK;
+		}
 
 		sa1100_start_dma(si->txdma, si->txbuf_dma, skb->len);