redonkable
/
freescale-linux-fslc
1
0
Fork 0
Code Releases Activity

clocksource/drivers/ingenic_ost: Fix return value check in ingenic_ost_probe() 

[ Upstream commit 2a65f7e277 ]

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: ca7b72b5a5 ("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>
pull/339/head^2
Wei Yongjun 2021-03-08 12:30:31 +00:00 committed by Greg Kroah-Hartman
parent edfcc18359
commit 1de3691168
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/clocksource/ingenic-ost.c
View File

@ -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");