diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2015-04-16 20:19:43 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-06 08:21:09 -0700 |
| commit | 889c495bb4ba20dd667cfd2dd10497e3120af824 (patch) | |
| tree | e11e101873b755fcd0e134e4582003d841db53bc | |
| parent | d38e166a121b62819e13b32560ef8673c8467535 (diff) | |
power/reset: at91: fix return value check in at91_reset_platform_probe()
commit 932df43005389300a3336421e4aedb25390ae144 upstream.
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.
Fixes: ecfe64d8c55f ("power: reset: Add AT91 reset driver")
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/power/reset/at91-reset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c index 13584e24736a..4d7d60e593b8 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; } } |