* [PATCH net] net/sonic: Use dma_mapping_error()
@ 2018-05-30 3:03 Finn Thain
2018-05-30 9:01 ` Tom Bogendoerfer
2018-05-31 18:18 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Finn Thain @ 2018-05-30 3:03 UTC (permalink / raw)
To: David S. Miller; +Cc: Thomas Bogendoerfer, netdev, linux-kernel
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: Finn Thain <fthain@telegraphics.com.au>
---
drivers/net/ethernet/natsemi/sonic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/natsemi/sonic.c b/drivers/net/ethernet/natsemi/sonic.c
index 7ed08486ae23..c805dcbebd02 100644
--- a/drivers/net/ethernet/natsemi/sonic.c
+++ b/drivers/net/ethernet/natsemi/sonic.c
@@ -84,7 +84,7 @@ static int sonic_open(struct net_device *dev)
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),
SONIC_RBSIZE, DMA_FROM_DEVICE);
- if (!laddr) {
+ if (dma_mapping_error(lp->device, laddr)) {
while(i > 0) { /* free any that were mapped successfully */
i--;
dma_unmap_single(lp->device, lp->rx_laddr[i], SONIC_RBSIZE, DMA_FROM_DEVICE);
--
2.16.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net] net/sonic: Use dma_mapping_error()
2018-05-30 3:03 [PATCH net] net/sonic: Use dma_mapping_error() Finn Thain
@ 2018-05-30 9:01 ` Tom Bogendoerfer
2018-05-31 18:18 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Tom Bogendoerfer @ 2018-05-30 9:01 UTC (permalink / raw)
To: Finn Thain; +Cc: David S. Miller, netdev, linux-kernel
On Wed, May 30, 2018 at 01:03:51PM +1000, Finn Thain wrote:
> 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: Finn Thain <fthain@telegraphics.com.au>
> ---
> drivers/net/ethernet/natsemi/sonic.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/natsemi/sonic.c b/drivers/net/ethernet/natsemi/sonic.c
> index 7ed08486ae23..c805dcbebd02 100644
> --- a/drivers/net/ethernet/natsemi/sonic.c
> +++ b/drivers/net/ethernet/natsemi/sonic.c
> @@ -84,7 +84,7 @@ static int sonic_open(struct net_device *dev)
> 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),
> SONIC_RBSIZE, DMA_FROM_DEVICE);
> - if (!laddr) {
> + if (dma_mapping_error(lp->device, laddr)) {
> while(i > 0) { /* free any that were mapped successfully */
> i--;
> dma_unmap_single(lp->device, lp->rx_laddr[i], SONIC_RBSIZE, DMA_FROM_DEVICE);
> --
> 2.16.1
looks good
Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] net/sonic: Use dma_mapping_error()
2018-05-30 3:03 [PATCH net] net/sonic: Use dma_mapping_error() Finn Thain
2018-05-30 9:01 ` Tom Bogendoerfer
@ 2018-05-31 18:18 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2018-05-31 18:18 UTC (permalink / raw)
To: fthain; +Cc: tsbogend, netdev, linux-kernel
From: Finn Thain <fthain@telegraphics.com.au>
Date: Wed, 30 May 2018 13:03:51 +1000
> 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: Finn Thain <fthain@telegraphics.com.au>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-31 18:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-30 3:03 [PATCH net] net/sonic: Use dma_mapping_error() Finn Thain
2018-05-30 9:01 ` Tom Bogendoerfer
2018-05-31 18:18 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox