diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2021-03-08 15:30:31 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-14 10:50:16 +0300 |
| commit | 1de36911689c192aa1c20682102ceb956b5372c0 (patch) | |
| tree | b42aa78f30342e663ab0435a107344c030c24a04 /drivers/clocksource | |
| parent | edfcc1835958392c0eaad85e6c0cb0b302fe3695 (diff) | |
| download | linux-1de36911689c192aa1c20682102ceb956b5372c0.tar.xz | |
clocksource/drivers/ingenic_ost: Fix return value check in ingenic_ost_probe()
[ Upstream commit 2a65f7e2772613debd03fa2492e76a635aa04545 ]
In case of error, the function device_node_to_regmap() returns
ERR_PTR() and never returns NULL. The NULL test in the return
value check should be replaced with IS_ERR().
Fixes: ca7b72b5a5f2 ("clocksource: Add driver for the Ingenic JZ47xx OST")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210308123031.2285083-1-weiyongjun1@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/ingenic-ost.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/ingenic-ost.c b/drivers/clocksource/ingenic-ost.c index 029efc2731b4..6af2470136bd 100644 --- a/drivers/clocksource/ingenic-ost.c +++ b/drivers/clocksource/ingenic-ost.c @@ -88,9 +88,9 @@ static int __init ingenic_ost_probe(struct platform_device *pdev) return PTR_ERR(ost->regs); map = device_node_to_regmap(dev->parent->of_node); - if (!map) { + if (IS_ERR(map)) { dev_err(dev, "regmap not found"); - return -EINVAL; + return PTR_ERR(map); } ost->clk = devm_clk_get(dev, "ost"); |