git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ethernet: micrel: fix some error codes
[pandora-kernel.git]
/
drivers
/
net
/
ethernet
/
micrel
/
ks8842.c
diff --git
a/drivers/net/ethernet/micrel/ks8842.c
b/drivers/net/ethernet/micrel/ks8842.c
index
4a6ae05
..
22ab098
100644
(file)
--- a/
drivers/net/ethernet/micrel/ks8842.c
+++ b/
drivers/net/ethernet/micrel/ks8842.c
@@
-562,8
+562,8
@@
static int __ks8842_start_new_rx_dma(struct net_device *netdev)
sg_init_table(sg, 1);
sg_dma_address(sg) = dma_map_single(adapter->dev,
ctl->skb->data, DMA_BUFFER_SIZE, DMA_FROM_DEVICE);
sg_init_table(sg, 1);
sg_dma_address(sg) = dma_map_single(adapter->dev,
ctl->skb->data, DMA_BUFFER_SIZE, DMA_FROM_DEVICE);
- err = dma_mapping_error(adapter->dev, sg_dma_address(sg));
- if (unlikely(err)) {
+ if (dma_mapping_error(adapter->dev, sg_dma_address(sg))) {
+ err = -ENOMEM;
sg_dma_address(sg) = 0;
goto out;
}
sg_dma_address(sg) = 0;
goto out;
}
@@
-574,8
+574,10
@@
static int __ks8842_start_new_rx_dma(struct net_device *netdev)
sg, 1, DMA_FROM_DEVICE,
DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
sg, 1, DMA_FROM_DEVICE,
DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
- if (!ctl->adesc)
+ if (!ctl->adesc) {
+ err = -ENOMEM;
goto out;
goto out;
+ }
ctl->adesc->callback_param = netdev;
ctl->adesc->callback = ks8842_dma_rx_cb;
ctl->adesc->callback_param = netdev;
ctl->adesc->callback = ks8842_dma_rx_cb;
@@
-586,7
+588,7
@@
static int __ks8842_start_new_rx_dma(struct net_device *netdev)
goto out;
}
goto out;
}
- return
err
;
+ return
0
;
out:
if (sg_dma_address(sg))
dma_unmap_single(adapter->dev, sg_dma_address(sg),
out:
if (sg_dma_address(sg))
dma_unmap_single(adapter->dev, sg_dma_address(sg),