Commit 932df430 authored Apr 16, 2015 by Wei Yongjun Committed by Sebastian Reichel Apr 30, 2015

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: ecfe64d8 ("power: reset: Add AT91 reset driver")
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

parent 2a6afddb

drivers/power/reset/at91-reset.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}