Skip to contentSkip to conversation

net: ethernet: micrel: fix an error code

PATCH Applied Dan Carpenter 3 participants 3 messages Aug 14, 2015 – Aug 17, 2015

Subsystems (3)
Networking Network drivers Kernel janitors
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 net: ethernet: micrel: fix an error code

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 <[email protected]>
drivers/net/ethernet/micrel/ks8842.c +2 -3
index f78909a..09d2e16 100644
@@ -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;
 	}
#1 lore raw
Quoted 2 lines · Dan Carpenter

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 :)

Signature · 1 line
~Vinod
Quoted 19 lines
Signed-off-by Dan Carpenter <[email protected]>
drivers/net/ethernet/micrel/ks8842.c +2 -3
index f78909a..09d2e16 100644
@@ -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;
 	}