| From df68d24ba3e8cda697171775dfe34a7c4e1d7067 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 8 Mar 2021 12:30:31 +0000 |
| Subject: clocksource/drivers/ingenic_ost: Fix return value check in |
| ingenic_ost_probe() |
| |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| |
| [ 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> |
| --- |
| drivers/clocksource/ingenic-ost.c | 4 ++-- |
| 1 file 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"); |
| -- |
| 2.30.2 |
| |
