From 0301cbafe2f8ebe06f22799ace3789f02345e257 Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 9 Aug 2012 09:06:35 +0000 Subject: [PATCH] [mcs814x] nuport-mac: use dma_mapping_error() instead of checking pointers Thanks Gabor for spotting this git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33071 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c | 4 ++-- 1 file 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 833e6fa01..a2f7ee2cd 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);