* [PATCH] ARM: u300: fix return value check in __u300_init_boardpower()
@ 2013-07-04 13:51 Wei Yongjun
2013-08-06 10:15 ` Linus Walleij
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2013-07-04 13:51 UTC (permalink / raw)
To: linus.walleij, linux, grant.likely, rob.herring
Cc: yongjun_wei, linux-arm-kernel, devicetree-discuss, linux-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
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>
---
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");
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ARM: u300: fix return value check in __u300_init_boardpower()
2013-07-04 13:51 [PATCH] ARM: u300: fix return value check in __u300_init_boardpower() Wei Yongjun
@ 2013-08-06 10:15 ` Linus Walleij
0 siblings, 0 replies; 2+ messages in thread
From: Linus Walleij @ 2013-08-06 10:15 UTC (permalink / raw)
To: Wei Yongjun
Cc: Russell King - ARM Linux, Grant Likely, Rob Herring, Wei Yongjun,
linux-arm-kernel, devicetree-discuss, linux-kernel
On Thu, Jul 4, 2013 at 3:51 PM, Wei Yongjun <weiyj.lk@gmail.com> wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> 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>
Patch applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-06 10:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-04 13:51 [PATCH] ARM: u300: fix return value check in __u300_init_boardpower() Wei Yongjun
2013-08-06 10:15 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).