diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-07-04 15:51:31 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-11-26 21:00:21 +0100 |
| commit | 1e74de30e0b49f5da67ae6fa3d5307630b4c86ea (patch) | |
| tree | a64bc3520ccc47bc02d827e2deb1a10580811846 /arch/arm/mach-u300 | |
| parent | Linux 3.13-rc1 (diff) | |
| download | linux-1e74de30e0b49f5da67ae6fa3d5307630b4c86ea.tar.xz linux-1e74de30e0b49f5da67ae6fa3d5307630b4c86ea.zip | |
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>
Diffstat (limited to 'arch/arm/mach-u300')
| -rw-r--r-- | arch/arm/mach-u300/regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/regulator.c b/arch/arm/mach-u300/regulator.c index bf40cd478fe9..0493a845b6bc 100644 --- a/arch/arm/mach-u300/regulator.c +++ b/arch/arm/mach-u300/regulator.c @@ -69,9 +69,9 @@ static int __init __u300_init_boardpower(struct platform_device *pdev) return -ENODEV; } regmap = syscon_node_to_regmap(syscon_np); - if (!regmap) { + if (IS_ERR(regmap)) { pr_crit("U300: could not locate syscon regmap\n"); - return -ENODEV; + return PTR_ERR(regmap); } main_power_15 = regulator_get(&pdev->dev, "vana15"); |