[3.13.y.z extended stable] Patch "can: c_can: checking IS_ERR() instead of NULL" has been added to staging queue

Kamal Mostafa kamal at canonical.com
Tue Sep 30 21:29:29 UTC 2014

This is a note to let you know that I have just added a patch titled

    can: c_can: checking IS_ERR() instead of NULL

to the linux-3.13.y-queue branch of the 3.13.y.z extended stable tree 
which can be found at:


This patch is scheduled to be released in version

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.13.y.z tree, see



>From eb48fb1cdac558a6b4addb091c885743797400b1 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter at oracle.com>
Date: Fri, 1 Aug 2014 11:53:44 +0300
Subject: can: c_can: checking IS_ERR() instead of NULL

commit 37b75a3aa8ec7031df75219fe2f8e5e9b7be398f upstream.

devm_ioremap() returns NULL on error, not an ERR_PTR().

Fixes: 33cf75656923 ('can: c_can_platform: Fix raminit, use devm_ioremap() instead of devm_ioremap_resource()')

Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
Signed-off-by: Marc Kleine-Budde <mkl at pengutronix.de>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
 drivers/net/can/c_can/c_can_platform.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index 873b83a..a7d4089 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -196,7 +196,7 @@ static int c_can_plat_probe(struct platform_device *pdev)
 		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
 		priv->raminit_ctrlreg = devm_ioremap(&pdev->dev, res->start,
-		if (IS_ERR(priv->raminit_ctrlreg) || (int)priv->instance < 0)
+		if (!priv->raminit_ctrlreg || priv->instance < 0)
 			dev_info(&pdev->dev, "control memory is not used for raminit\n");
 			priv->raminit = c_can_hw_raminit;

More information about the kernel-team mailing list