From: Dan Carpenter <dan.carpenter@oracle.com>
To: Wolfgang Grandegger <wg@grandegger.com>,
George Cherian <george.cherian@ti.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>,
Grant Likely <grant.likely@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Thor Thayer <tthayer@altera.com>, Pavel Machek <pavel@denx.de>,
Mugunthan V N <mugunthanvnm@ti.com>,
"Lad, Prabhakar" <prabhakar.csengg@gmail.com>,
Wolfram Sang <wsa@sang-engineering.com>,
linux-can@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] can: c_can: checking IS_ERR() instead of NULL
Date: Fri, 1 Aug 2014 11:53:44 +0300 [thread overview]
Message-ID: <20140801085344.GA31702@mwanda> (raw)
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@oracle.com>
---
This will need to go to -stable because the patch which introduces the
bug is going to be pushed to -stable.
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index 5dede6e..109cb44 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -280,7 +280,7 @@ static int c_can_plat_probe(struct platform_device *pdev)
priv->raminit_ctrlreg = devm_ioremap(&pdev->dev, res->start,
resource_size(res));
- if (IS_ERR(priv->raminit_ctrlreg) || priv->instance < 0)
+ if (!priv->raminit_ctrlreg || priv->instance < 0)
dev_info(&pdev->dev, "control memory is not used for raminit\n");
else
priv->raminit = c_can_hw_raminit_ti;
next reply other threads:[~2014-08-01 8:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-01 8:53 Dan Carpenter [this message]
2014-08-01 9:01 ` [patch] can: c_can: checking IS_ERR() instead of NULL Marc Kleine-Budde
2014-08-01 9:13 ` Dan Carpenter
2014-08-01 9:15 ` Marc Kleine-Budde
2014-08-01 18:16 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140801085344.GA31702@mwanda \
--to=dan.carpenter@oracle.com \
--cc=george.cherian@ti.com \
--cc=grant.likely@linaro.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=mugunthanvnm@ti.com \
--cc=pavel@denx.de \
--cc=prabhakar.csengg@gmail.com \
--cc=robh+dt@kernel.org \
--cc=tthayer@altera.com \
--cc=wg@grandegger.com \
--cc=wsa@sang-engineering.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).