Patch "power/reset: at91: fix return value check in at91_reset_platform_probe()" has been added to the 4.0-stable tree

Patch "power/reset: at91: fix return value check in at91_reset_platform_probe()" has been added to the 4.0-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    power/reset: at91: fix return value check in at91_reset_platform_probe()

to the 4.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     power-reset-at91-fix-return-value-check-in-at91_reset_platform_probe.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 932df43005389300a3336421e4aedb25390ae144 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 16 Apr 2015 20:19:43 +0800
Subject: power/reset: at91: fix return value check in at91_reset_platform_probe()

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

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>

---
 drivers/power/reset/at91-reset.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/power/reset/at91-reset.c
+++ b/drivers/power/reset/at91-reset.c
@@ -212,9 +212,9 @@ static int at91_reset_platform_probe(str
 		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;
 		}
 	}
 


Patches currently in stable-queue which might be from yongjun_wei@trendmicro.com.cn are

queue-4.0/power-reset-at91-fix-return-value-check-in-at91_reset_platform_probe.patch