Commit 1e74de30 authored by Wei Yongjun's avatar Wei Yongjun Committed by Linus Walleij

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: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
parent 6ce4eac1
...@@ -69,9 +69,9 @@ static int __init __u300_init_boardpower(struct platform_device *pdev) ...@@ -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");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment