From: Wei Yongjun <weiyj.lk@gmail.com>
To: Wolfgang Grandegger <wg@grandegger.com>,
Marc Kleine-Budde <mkl@pengutronix.de>,
Anton Glukhov <anton.a.glukhov@gmail.com>,
Yegor Yefremov <yegorslists@googlemail.com>
Cc: Wei Yongjun <weiyongjun1@huawei.com>,
linux-can@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH net-next] can: ti_hecc: fix return value check in ti_hecc_probe()
Date: Tue, 25 Apr 2017 06:44:05 +0000 [thread overview]
Message-ID: <20170425064405.3964-1-weiyj.lk@gmail.com> (raw)
From: Wei Yongjun <weiyongjun1@huawei.com>
In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().
Fixes: dabf54dd1c63 ("can: ti_hecc: Convert TI HECC driver to DT only driver")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/net/can/ti_hecc.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index b8aac53..4d49414 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -898,9 +898,9 @@ static int ti_hecc_probe(struct platform_device *pdev)
}
priv->base = devm_ioremap_resource(&pdev->dev, res);
- if (!priv->base) {
+ if (IS_ERR(priv->base)) {
dev_err(&pdev->dev, "hecc ioremap failed\n");
- return -ENOMEM;
+ return PTR_ERR(priv->base);
}
/* handle hecc-ram memory */
@@ -911,9 +911,9 @@ static int ti_hecc_probe(struct platform_device *pdev)
}
priv->hecc_ram = devm_ioremap_resource(&pdev->dev, res);
- if (!priv->hecc_ram) {
+ if (IS_ERR(priv->hecc_ram)) {
dev_err(&pdev->dev, "hecc-ram ioremap failed\n");
- return -ENOMEM;
+ return PTR_ERR(priv->hecc_ram);
}
/* handle mbx memory */
@@ -924,9 +924,9 @@ static int ti_hecc_probe(struct platform_device *pdev)
}
priv->mbx = devm_ioremap_resource(&pdev->dev, res);
- if (!priv->mbx) {
+ if (IS_ERR(priv->mbx)) {
dev_err(&pdev->dev, "mbx ioremap failed\n");
- return -ENOMEM;
+ return PTR_ERR(priv->mbx);
}
irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
next reply other threads:[~2017-04-25 6:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-25 6:44 Wei Yongjun [this message]
2017-04-25 8:49 ` [PATCH net-next] can: ti_hecc: fix return value check in ti_hecc_probe() Marc Kleine-Budde
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=20170425064405.3964-1-weiyj.lk@gmail.com \
--to=weiyj.lk@gmail.com \
--cc=anton.a.glukhov@gmail.com \
--cc=linux-can@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=weiyongjun1@huawei.com \
--cc=wg@grandegger.com \
--cc=yegorslists@googlemail.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