hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: u300: fix return value check in __u300_init_boardpower() 

In case of error, the function syscon_node_to_regmap() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
This commit is contained in:
Wei Yongjun 2013-07-04 21:51:31 +08:00 committed by Linus Walleij
parent 6ce4eac1f6
commit 1e74de30e0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-u300/regulator.c
View File

@ -69,9 +69,9 @@ static int __init __u300_init_boardpower(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
regmap = syscon_node_to_regmap(syscon_np); regmap = syscon_node_to_regmap(syscon_np);
if (!regmap) { if (IS_ERR(regmap)) {
pr_crit("U300: could not locate syscon regmap\n"); pr_crit("U300: could not locate syscon regmap\n");
return -ENODEV; return PTR_ERR(regmap);
} }
main_power_15 = regulator_get(&pdev->dev, "vana15"); main_power_15 = regulator_get(&pdev->dev, "vana15");