Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b64cc7 authored by Finn Thain's avatar Finn Thain Committed by Greg Kroah-Hartman
Browse files

net/sonic: Use dma_mapping_error() 



[ Upstream commit 26de0b76d9ba3200f09c6cb9d9618bda338be5f7 ]

With CONFIG_DMA_API_DEBUG=y, calling sonic_open() produces the
message, "DMA-API: device driver failed to check map error".
Add the missing dma_mapping_error() call.

Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Acked-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4888ced6

drivers/net/ethernet/natsemi/sonic.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ static int sonic_open(struct net_device *dev) 
	for (i = 0; i < SONIC_NUM_RRS; i++) {

	for (i = 0; i < SONIC_NUM_RRS; i++) {

		dma_addr_t laddr = dma_map_single(lp->device, skb_put(lp->rx_skb[i], SONIC_RBSIZE),

		dma_addr_t laddr = dma_map_single(lp->device, skb_put(lp->rx_skb[i], SONIC_RBSIZE),

		                                  SONIC_RBSIZE, DMA_FROM_DEVICE);

		                                  SONIC_RBSIZE, DMA_FROM_DEVICE);

		if (!laddr) {

		if (dma_mapping_error(lp->device, laddr)) {

			while(i > 0) { /* free any that were mapped successfully */

			while(i > 0) { /* free any that were mapped successfully */

				i--;

				i--;

				dma_unmap_single(lp->device, lp->rx_laddr[i], SONIC_RBSIZE, DMA_FROM_DEVICE);

				dma_unmap_single(lp->device, lp->rx_laddr[i], SONIC_RBSIZE, DMA_FROM_DEVICE);