1 files changed, 16 insertions, 2 deletions

diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index a72f7c2577de..4bf4c213baec 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -157,6 +157,14 @@ static void p54p_refill_rx_ring(struct ieee80211_hw *dev,
                                                  skb_tail_pointer(skb),
                                                  priv->common.rx_mtu + 32,
                                                  PCI_DMA_FROMDEVICE);
+
+                        if (pci_dma_mapping_error(priv->pdev, mapping)) {
+                                dev_kfree_skb_any(skb);
+                                dev_err(&priv->pdev->dev,
+                                        "RX DMA Mapping error\n");
+                                break;
+                        }
+
                         desc->host_addr = cpu_to_le32(mapping);
                         desc->device_addr = 0;  // FIXME: necessary?
                         desc->len = cpu_to_le16(priv->common.rx_mtu + 32);
@@ -325,14 +333,20 @@ static void p54p_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
         u32 device_idx, idx, i;
 
         spin_lock_irqsave(&priv->lock, flags);
-
         device_idx = le32_to_cpu(ring_control->device_idx[1]);
         idx = le32_to_cpu(ring_control->host_idx[1]);
         i = idx % ARRAY_SIZE(ring_control->tx_data);
 
-        priv->tx_buf_data[i] = skb;
         mapping = pci_map_single(priv->pdev, skb->data, skb->len,
                                  PCI_DMA_TODEVICE);
+        if (pci_dma_mapping_error(priv->pdev, mapping)) {
+                spin_unlock_irqrestore(&priv->lock, flags);
+                p54_free_skb(dev, skb);
+                dev_err(&priv->pdev->dev, "TX DMA mapping error\n");
+                return ;
+        }
+        priv->tx_buf_data[i] = skb;
+
         desc = &ring_control->tx_data[i];
         desc->host_addr = cpu_to_le32(mapping);
         desc->device_addr = ((struct p54_hdr *)skb->data)->req_id;