| Message ID | 20201112144936.54776-1-yuehaibing@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | net: macb: Fix passing zero to 'PTR_ERR' | expand |
On Thu, 12 Nov 2020 22:49:36 +0800 YueHaibing wrote: > Check PTR_ERR with IS_ERR to fix this. > > Fixes: cd5afa91f078 ("net: macb: Add null check for PCLK and HCLK") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Looks like a cleanup PTR_ERR() should return 0 for NULL AFAICS. Applied to net-next, thanks!
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 51f866288582..7b1d195787dc 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -3711,19 +3711,13 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk, } if (IS_ERR_OR_NULL(*pclk)) { - err = PTR_ERR(*pclk); - if (!err) - err = -ENODEV; - + err = IS_ERR(*pclk) ? PTR_ERR(*pclk) : -ENODEV; dev_err(&pdev->dev, "failed to get macb_clk (%d)\n", err); return err; } if (IS_ERR_OR_NULL(*hclk)) { - err = PTR_ERR(*hclk); - if (!err) - err = -ENODEV; - + err = IS_ERR(*hclk) ? PTR_ERR(*hclk) : -ENODEV; dev_err(&pdev->dev, "failed to get hclk (%d)\n", err); return err; }
Check PTR_ERR with IS_ERR to fix this. Fixes: cd5afa91f078 ("net: macb: Add null check for PCLK and HCLK") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/net/ethernet/cadence/macb_main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)