From: Yang Yingliang <yangyingliang@huawei.com>
To: <linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>
Cc: <davem@davemloft.net>, <kuba@kernel.org>,
<lars.povlsen@microchip.com>, <Steen.Hegelund@microchip.com>
Subject: [PATCH net-next 2/3] net: sparx5: fix return value check in sparx5_create_targets()
Date: Sat, 26 Jun 2021 12:44:19 +0800 [thread overview]
Message-ID: <20210626044420.390517-3-yangyingliang@huawei.com> (raw)
In-Reply-To: <20210626044420.390517-1-yangyingliang@huawei.com>
In case of error, the function devm_ioremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test.
Fixes: 3cfa11bac9bb ("net: sparx5: add the basic sparx5 driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/net/ethernet/microchip/sparx5/sparx5_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
index 665e20ccb404..abaa086ce345 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
@@ -236,10 +236,10 @@ static int sparx5_create_targets(struct sparx5 *sparx5)
iores[idx]->start,
iores[idx]->end - iores[idx]->start
+ 1);
- if (IS_ERR(iomem[idx])) {
+ if (!iomem[idx]) {
dev_err(sparx5->dev, "Unable to get switch registers: %s\n",
iores[idx]->name);
- return PTR_ERR(iomem[idx]);
+ return -ENOMEM;
}
begin[idx] = iomem[idx] - sparx5_main_iomap[range_id[idx]].offset;
}
--
2.25.1
next prev parent reply other threads:[~2021-06-26 4:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-26 4:44 [PATCH net-next 0/3] fix some bugs for sparx5 Yang Yingliang
2021-06-26 4:44 ` [PATCH net-next 1/3] net: sparx5: check return value after calling platform_get_resource() Yang Yingliang
2021-06-26 4:44 ` Yang Yingliang [this message]
2021-06-26 4:44 ` [PATCH net-next 3/3] net: sparx5: fix error return code in sparx5_register_notifier_blocks() Yang Yingliang
2021-06-28 21:30 ` [PATCH net-next 0/3] fix some bugs for sparx5 patchwork-bot+netdevbpf
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=20210626044420.390517-3-yangyingliang@huawei.com \
--to=yangyingliang@huawei.com \
--cc=Steen.Hegelund@microchip.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=lars.povlsen@microchip.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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
all inboxes | Powered by JetHome®