| Message ID | 20200603175025.GA19353@mwanda |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: ethernet: dwmac: Fix an error code in imx_dwmac_probe() | expand |
From: Dan Carpenter <dan.carpenter@oracle.com> Sent: Thursday, June 4, 2020 1:50 AM > The code is return PTR_ERR(NULL) which is zero or success. We should > return -ENOMEM instead. > > Fixes: 94abdad6974a5 ("net: ethernet: dwmac: add ethernet glue logic for > NXP imx8 chip") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Thanks! Acked-by: Fugang Duan <fugang.duan@nxp.com> > --- > drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c > b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c > index 5010af7dab4af..3c5df5eeed6c8 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c > @@ -225,7 +225,7 @@ static int imx_dwmac_probe(struct platform_device > *pdev) > > dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), > GFP_KERNEL); > if (!dwmac) > - return PTR_ERR(dwmac); > + return -ENOMEM; > > plat_dat = stmmac_probe_config_dt(pdev, &stmmac_res.mac); > if (IS_ERR(plat_dat)) > -- > 2.26.2
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Wed, 3 Jun 2020 20:50:25 +0300 > The code is return PTR_ERR(NULL) which is zero or success. We should > return -ENOMEM instead. > > Fixes: 94abdad6974a5 ("net: ethernet: dwmac: add ethernet glue logic for NXP imx8 chip") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied.
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c index 5010af7dab4af..3c5df5eeed6c8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c @@ -225,7 +225,7 @@ static int imx_dwmac_probe(struct platform_device *pdev) dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL); if (!dwmac) - return PTR_ERR(dwmac); + return -ENOMEM; plat_dat = stmmac_probe_config_dt(pdev, &stmmac_res.mac); if (IS_ERR(plat_dat))
The code is return PTR_ERR(NULL) which is zero or success. We should return -ENOMEM instead. Fixes: 94abdad6974a5 ("net: ethernet: dwmac: add ethernet glue logic for NXP imx8 chip") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)