* [PATCH] power/reset: at91: fix return value check in at91_reset_platform_probe()
@ 2015-04-16 12:19 weiyj_lk
2015-04-30 15:38 ` Sebastian Reichel
0 siblings, 1 reply; 2+ messages in thread
From: weiyj_lk @ 2015-04-16 12:19 UTC (permalink / raw)
To: Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse,
Nicolas Ferre, Alexandre Belloni, Guenter Roeck, Maxime Ripard
Cc: Wei Yongjun, linux-pm
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
In case of error, the function devm_ioremap() returns NULL
not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
drivers/power/reset/at91-reset.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
index 13584e2..4d7d60e 100644
--- a/drivers/power/reset/at91-reset.c
+++ b/drivers/power/reset/at91-reset.c
@@ -212,9 +212,9 @@ static int at91_reset_platform_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, idx + 1 );
at91_ramc_base[idx] = devm_ioremap(&pdev->dev, res->start,
resource_size(res));
- if (IS_ERR(at91_ramc_base[idx])) {
+ if (!at91_ramc_base[idx]) {
dev_err(&pdev->dev, "Could not map ram controller address\n");
- return PTR_ERR(at91_ramc_base[idx]);
+ return -ENOMEM;
}
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] power/reset: at91: fix return value check in at91_reset_platform_probe()
2015-04-16 12:19 [PATCH] power/reset: at91: fix return value check in at91_reset_platform_probe() weiyj_lk
@ 2015-04-30 15:38 ` Sebastian Reichel
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Reichel @ 2015-04-30 15:38 UTC (permalink / raw)
To: weiyj_lk
Cc: Dmitry Eremin-Solenikov, David Woodhouse, Nicolas Ferre,
Alexandre Belloni, Guenter Roeck, Maxime Ripard, Wei Yongjun,
linux-pm
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
Hi Wei,
On Thu, Apr 16, 2015 at 08:19:43PM +0800, weiyj_lk@163.com wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> In case of error, the function devm_ioremap() returns NULL
> not ERR_PTR(). The IS_ERR() test in the return value check
> should be replaced with NULL test.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Thanks, queued for 4.1-rc with proper Fixes tag:
http://git.infradead.org/battery-2.6.git/commit/932df43005389300a3336421e4aedb25390ae144
-- Sebastian
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-04-30 15:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-16 12:19 [PATCH] power/reset: at91: fix return value check in at91_reset_platform_probe() weiyj_lk
2015-04-30 15:38 ` Sebastian Reichel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.