projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e79387
)
net: macb: Fix passing zero to 'PTR_ERR'
author
YueHaibing
<yuehaibing@huawei.com>
Thu, 12 Nov 2020 14:49:36 +0000
(22:49 +0800)
committer
Jakub Kicinski
<kuba@kernel.org>
Sat, 14 Nov 2020 20:35:33 +0000
(12:35 -0800)
Check PTR_ERR with IS_ERR to fix this.
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Link:
https://lore.kernel.org/r/20201112144936.54776-1-yuehaibing@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/cadence/macb_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/cadence/macb_main.c
b/drivers/net/ethernet/cadence/macb_main.c
index 51f866288582ec23080f254ed4a7471d647c2fab..7b1d195787dcce1389534fdd6dc49e0bdd57da8d 100644
(file)
--- 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;
}