* [patch] net: ethernet: micrel: fix an error code
@ 2015-08-14 8:54 Dan Carpenter
2015-08-17 8:24 ` Vinod Koul
2015-08-17 19:23 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2015-08-14 8:54 UTC (permalink / raw)
To: Vinod Koul; +Cc: Vinod Koul, netdev, kernel-janitors
The dma_mapping_error() function returns true or false. We should
return -ENOMEM if it there is a dma mapping error.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index f78909a..09d2e16 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/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);
- 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;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [patch] net: ethernet: micrel: fix an error code
2015-08-14 8:54 [patch] net: ethernet: micrel: fix an error code Dan Carpenter
@ 2015-08-17 8:24 ` Vinod Koul
2015-08-17 19:23 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2015-08-17 8:24 UTC (permalink / raw)
To: Dan Carpenter; +Cc: netdev, kernel-janitors
On Fri, Aug 14, 2015 at 11:54:59AM +0300, Dan Carpenter wrote:
> The dma_mapping_error() function returns true or false. We should
> return -ENOMEM if it there is a dma mapping error.
Looks good to me, but should be sent to net folks now me :)
--
~Vinod
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
> index f78909a..09d2e16 100644
> --- a/drivers/net/ethernet/micrel/ks8842.c
> +++ b/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);
> - 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;
> }
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch] net: ethernet: micrel: fix an error code
2015-08-14 8:54 [patch] net: ethernet: micrel: fix an error code Dan Carpenter
2015-08-17 8:24 ` Vinod Koul
@ 2015-08-17 19:23 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2015-08-17 19:23 UTC (permalink / raw)
To: dan.carpenter; +Cc: vinod.koul, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 14 Aug 2015 11:54:59 +0300
> The dma_mapping_error() function returns true or false. We should
> return -ENOMEM if it there is a dma mapping error.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks Dan.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-17 19:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-14 8:54 [patch] net: ethernet: micrel: fix an error code Dan Carpenter
2015-08-17 8:24 ` Vinod Koul
2015-08-17 19:23 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).