| Message ID | 20211203101128.GG2480@kili (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | badd7857f5c933a3dc34942a2c11d67fdbdc24de |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: altera: set a couple error code in probe() | expand |
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 3 Dec 2021 13:11:28 +0300 you wrote: > There are two error paths which accidentally return success instead of > a negative error code. > > Fixes: bbd2190ce96d ("Altera TSE: Add main and header file for Altera Ethernet Driver") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/net/ethernet/altera/altera_tse_main.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) Here is the summary with links: - [net] net: altera: set a couple error code in probe() https://git.kernel.org/netdev/net/c/badd7857f5c9 You are awesome, thank you!
diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c index d75d95a97dd9..993b2fb42961 100644 --- a/drivers/net/ethernet/altera/altera_tse_main.c +++ b/drivers/net/ethernet/altera/altera_tse_main.c @@ -1430,16 +1430,19 @@ static int altera_tse_probe(struct platform_device *pdev) priv->rxdescmem_busaddr = dma_res->start; } else { + ret = -ENODEV; goto err_free_netdev; } - if (!dma_set_mask(priv->device, DMA_BIT_MASK(priv->dmaops->dmamask))) + if (!dma_set_mask(priv->device, DMA_BIT_MASK(priv->dmaops->dmamask))) { dma_set_coherent_mask(priv->device, DMA_BIT_MASK(priv->dmaops->dmamask)); - else if (!dma_set_mask(priv->device, DMA_BIT_MASK(32))) + } else if (!dma_set_mask(priv->device, DMA_BIT_MASK(32))) { dma_set_coherent_mask(priv->device, DMA_BIT_MASK(32)); - else + } else { + ret = -EIO; goto err_free_netdev; + } /* MAC address space */ ret = request_and_map(pdev, "control_port", &control_port,
There are two error paths which accidentally return success instead of a negative error code. Fixes: bbd2190ce96d ("Altera TSE: Add main and header file for Altera Ethernet Driver") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/net/ethernet/altera/altera_tse_main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)