Thread (4 messages) flat view 4 messages, 3 authors, 2020-11-18

Re: [PATCH net] atl1e: fix error return code in atl1e_probe()

From: Marion & Christophe JAILLET <hidden>
Date: 2020-11-17 20:39:15
Also in: lkml

Le 17/11/2020 à 03:57, Zhang Changzhong a écrit :
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: 85eb5bc33717 ("net: atheros: switch from 'pci_' to 'dma_' API")
Hi, should it have any importance, the Fixes tag is wrong.

The issue was already there before 85eb5bc33717 which was just a 
mechanical update.

just my 2c

CJ
quoted hunk ↗ jump to hunk
Reported-by: Hulk Robot <redacted>
Signed-off-by: Zhang Changzhong <redacted>
---
  drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index 098b032..ff9f96d 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -2312,8 +2312,8 @@ static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
  	 * various kernel subsystems to support the mechanics required by a
  	 * fixed-high-32-bit system.
  	 */
-	if ((dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)) != 0) ||
-	    (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)) != 0)) {
+	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+	if (err) {
  		dev_err(&pdev->dev, "No usable DMA configuration,aborting\n");
  		goto err_dma;
  	}
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help