summaryrefslogtreecommitdiff
path: root/drivers/atm
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-03-17 13:56:06 -0700
committerJakub Kicinski <kuba@kernel.org>2022-03-17 13:56:58 -0700
commite243f39685af1bd6d837fa7bff40c1afdf3eb7fa (patch)
tree61e9d9b74a0814f950a693ebe8061293e4960b1e /drivers/atm
parent1abea24af42c35c6eb537e4402836e2cde2a5b13 (diff)
parent551acdc3c3d2b6bc97f11e31dcf960bc36343bfc (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/atm')
-rw-r--r--drivers/atm/eni.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 422753d52244..a31ffe16e626 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -1112,6 +1112,8 @@ DPRINTK("iovcnt = %d\n",skb_shinfo(skb)->nr_frags);
skb_data3 = skb->data[3];
paddr = dma_map_single(&eni_dev->pci_dev->dev,skb->data,skb->len,
DMA_TO_DEVICE);
+ if (dma_mapping_error(&eni_dev->pci_dev->dev, paddr))
+ return enq_next;
ENI_PRV_PADDR(skb) = paddr;
/* prepare DMA queue entries */
j = 0;