Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
ethernet
/
micrel
/
ks8842.c
diff --git
a/kernel/drivers/net/ethernet/micrel/ks8842.c
b/kernel/drivers/net/ethernet/micrel/ks8842.c
index
f78909a
..
09d2e16
100644
(file)
--- a/
kernel/drivers/net/ethernet/micrel/ks8842.c
+++ b/
kernel/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);
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;
}
sg_dma_address(&tx_ctl->sg) = 0;
goto err;
}