diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2015-04-16 08:19:43 -0400 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2015-04-30 11:33:52 -0400 |
commit | 932df43005389300a3336421e4aedb25390ae144 (patch) | |
tree | d1ad335f1e3f1ac3af814232c587fdc4900af7ed | |
parent | 2a6afddb6656aefbc6e8d6ef1f95749895ae2945 (diff) |
power/reset: at91: fix return value check in at91_reset_platform_probe()
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>
-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 01c7055c4200..ca461ebc7ae8 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) | |||
212 | res = platform_get_resource(pdev, IORESOURCE_MEM, idx + 1 ); | 212 | res = platform_get_resource(pdev, IORESOURCE_MEM, idx + 1 ); |
213 | at91_ramc_base[idx] = devm_ioremap(&pdev->dev, res->start, | 213 | at91_ramc_base[idx] = devm_ioremap(&pdev->dev, res->start, |
214 | resource_size(res)); | 214 | resource_size(res)); |
215 | if (IS_ERR(at91_ramc_base[idx])) { | 215 | if (!at91_ramc_base[idx]) { |
216 | dev_err(&pdev->dev, "Could not map ram controller address\n"); | 216 | dev_err(&pdev->dev, "Could not map ram controller address\n"); |
217 | return PTR_ERR(at91_ramc_base[idx]); | 217 | return -ENOMEM; |
218 | } | 218 | } |
219 | } | 219 | } |
220 | 220 | ||