projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
82463d9
)
net/sonic: use dma_mapping_error() for error check
author
Zhang Changzhong
<zhangchangzhong@huawei.com>
Tue, 21 Mar 2023 03:45:43 +0000
(14:45 +1100)
committer
Jakub Kicinski
<kuba@kernel.org>
Wed, 22 Mar 2023 04:29:34 +0000
(21:29 -0700)
The DMA address returned by dma_map_single() should be checked with
dma_mapping_error(). Fix it accordingly.
Fixes: efcce839360f ("[PATCH] macsonic/jazzsonic network drivers update")
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Link:
https://lore.kernel.org/r/6645a4b5c1e364312103f48b7b36783b94e197a2.1679370343.git.fthain@linux-m68k.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/natsemi/sonic.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/natsemi/sonic.c
b/drivers/net/ethernet/natsemi/sonic.c
index d17d1b4f2585fed3e16ab0208a441a3aaf5bc025..825356ee3492ec62375f85255009bb51a04317ce 100644
(file)
--- a/
drivers/net/ethernet/natsemi/sonic.c
+++ b/
drivers/net/ethernet/natsemi/sonic.c
@@
-292,7
+292,7
@@
static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
*/
laddr = dma_map_single(lp->device, skb->data, length, DMA_TO_DEVICE);
- if (
!laddr
) {
+ if (
dma_mapping_error(lp->device, laddr)
) {
pr_err_ratelimited("%s: failed to map tx DMA buffer.\n", dev->name);
dev_kfree_skb_any(skb);
return NETDEV_TX_OK;
@@
-509,7
+509,7
@@
static bool sonic_alloc_rb(struct net_device *dev, struct sonic_local *lp,
*new_addr = dma_map_single(lp->device, skb_put(*new_skb, SONIC_RBSIZE),
SONIC_RBSIZE, DMA_FROM_DEVICE);
- if (
!*new_addr
) {
+ if (
dma_mapping_error(lp->device, *new_addr)
) {
dev_kfree_skb(*new_skb);
*new_skb = NULL;
return false;