diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2015-08-14 11:54:59 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-08-17 12:23:22 -0700 |
| commit | 2902bc66fa7a6d959e033e5358fd836e2839b5db (patch) | |
| tree | c1fa8dd88ea0f95e2590d38b9faf0f69e503de99 /drivers/net/ethernet/micrel | |
| parent | ppp: fix device unregistration upon netns deletion (diff) | |
| download | linux-dev-2902bc66fa7a6d959e033e5358fd836e2839b5db.tar.xz linux-dev-2902bc66fa7a6d959e033e5358fd836e2839b5db.zip | |
net: ethernet: micrel: fix an error code
The dma_mapping_error() function returns true or false. We should
return -ENOMEM if it there is a dma mapping error.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/micrel')
| -rw-r--r-- | drivers/net/ethernet/micrel/ks8842.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c index f78909a00f15..09d2e16fd6b0 100644 --- a/drivers/net/ethernet/micrel/ks8842.c +++ b/drivers/net/ethernet/micrel/ks8842.c @@ -952,9 +952,8 @@ static int ks8842_alloc_dma_bufs(struct net_device *netdev) sg_dma_address(&tx_ctl->sg) = dma_map_single(adapter->dev, tx_ctl->buf, DMA_BUFFER_SIZE, DMA_TO_DEVICE); - err = dma_mapping_error(adapter->dev, - sg_dma_address(&tx_ctl->sg)); - if (err) { + if (dma_mapping_error(adapter->dev, sg_dma_address(&tx_ctl->sg))) { + err = -ENOMEM; sg_dma_address(&tx_ctl->sg) = 0; goto err; } |