aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-08-09 09:06:35 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-08-09 09:06:35 +0000
commit47380a4388c18e700f45a03131020a0eabefdba0 (patch)
tree443f78ad3d5195e0b240806f1b5c45933af2978f /target/linux
parent7f9bfa3fcd05aa1ee864ba07b8f74bd6cd6de025 (diff)
downloadupstream-47380a4388c18e700f45a03131020a0eabefdba0.tar.gz
upstream-47380a4388c18e700f45a03131020a0eabefdba0.tar.bz2
upstream-47380a4388c18e700f45a03131020a0eabefdba0.zip
nuport-mac: use dma_mapping_error() instead of checking pointers
Thanks Gabor for spotting this SVN-Revision: 33071
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c b/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
index 833e6fa018..a2f7ee2cd5 100644
--- a/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
+++ b/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
@@ -256,7 +256,7 @@ static int nuport_mac_start_tx_dma(struct nuport_mac_priv *priv,
priv->tx_addr = dma_map_single(&priv->pdev->dev, skb->data,
skb->len, DMA_TO_DEVICE);
- if (!priv->tx_addr)
+ if (dma_mapping_error(&priv->pdev->dev, priv->tx_addr))
return -ENOMEM;
/* enable enhanced mode */
@@ -299,7 +299,7 @@ static int nuport_mac_start_rx_dma(struct nuport_mac_priv *priv,
priv->rx_addr = dma_map_single(&priv->pdev->dev, skb->data,
RX_ALLOC_SIZE, DMA_FROM_DEVICE);
- if (!priv->rx_addr)
+ if (dma_mapping_error(&priv->pdev->dev, priv->rx_addr))
return -ENOMEM;
nuport_mac_writel(priv->rx_addr, RX_BUFFER_ADDR);