2013-07-04 13:51:33

by Wei Yongjun

Subject: [PATCH] ARM: u300: fix return value check in __u300_init_boardpower()

From: Wei Yongjun <[email protected]>

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 <[email protected]>
---
arch/arm/mach-u300/regulator.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-u300/regulator.c b/arch/arm/mach-u300/regulator.c
index bf40cd4..0493a84 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");

2013-08-06 10:15:30

by Linus Walleij

Subject: Re: [PATCH] ARM: u300: fix return value check in __u300_init_boardpower()

On Thu, Jul 4, 2013 at 3:51 PM, Wei Yongjun <[email protected]> wrote:

> From: Wei Yongjun <[email protected]>
>
> 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 <[email protected]>

Patch applied.

Yours,
Linus Walleij