* [PATCH] net: ag71xx: fix return value check in ag71xx_probe()
@ 2019-07-17 11:52 Wei Yongjun
2019-07-18 7:39 ` Oleksij Rempel
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Wei Yongjun @ 2019-07-17 11:52 UTC (permalink / raw)
To: Jay Cliburn, Chris Snook, Oleksij Rempel
Cc: Wei Yongjun, netdev, kernel-janitors
In case of error, the function of_get_mac_address() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().
Fixes: d51b6ce441d3 ("net: ethernet: add ag71xx driver")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/net/ethernet/atheros/ag71xx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c
index 72a57c6cd254..3088a43e6436 100644
--- a/drivers/net/ethernet/atheros/ag71xx.c
+++ b/drivers/net/ethernet/atheros/ag71xx.c
@@ -1732,9 +1732,9 @@ static int ag71xx_probe(struct platform_device *pdev)
ag->stop_desc->next = (u32)ag->stop_desc_dma;
mac_addr = of_get_mac_address(np);
- if (mac_addr)
+ if (!IS_ERR(mac_addr))
memcpy(ndev->dev_addr, mac_addr, ETH_ALEN);
- if (!mac_addr || !is_valid_ether_addr(ndev->dev_addr)) {
+ if (IS_ERR(mac_addr) || !is_valid_ether_addr(ndev->dev_addr)) {
netif_err(ag, probe, ndev, "invalid MAC address, using random address\n");
eth_random_addr(ndev->dev_addr);
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] net: ag71xx: fix return value check in ag71xx_probe()
2019-07-17 11:52 [PATCH] net: ag71xx: fix return value check in ag71xx_probe() Wei Yongjun
@ 2019-07-18 7:39 ` Oleksij Rempel
2019-07-18 23:21 ` David Miller
2019-07-19 1:22 ` [PATCH v2] " Wei Yongjun
2 siblings, 0 replies; 5+ messages in thread
From: Oleksij Rempel @ 2019-07-18 7:39 UTC (permalink / raw)
To: Wei Yongjun, Jay Cliburn, Chris Snook; +Cc: netdev, kernel-janitors
On 17.07.19 13:52, Wei Yongjun wrote:
> In case of error, the function of_get_mac_address() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value check should
> be replaced with IS_ERR().
>
> Fixes: d51b6ce441d3 ("net: ethernet: add ag71xx driver")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
> drivers/net/ethernet/atheros/ag71xx.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c
> index 72a57c6cd254..3088a43e6436 100644
> --- a/drivers/net/ethernet/atheros/ag71xx.c
> +++ b/drivers/net/ethernet/atheros/ag71xx.c
> @@ -1732,9 +1732,9 @@ static int ag71xx_probe(struct platform_device *pdev)
> ag->stop_desc->next = (u32)ag->stop_desc_dma;
>
> mac_addr = of_get_mac_address(np);
> - if (mac_addr)
> + if (!IS_ERR(mac_addr))
> memcpy(ndev->dev_addr, mac_addr, ETH_ALEN);
> - if (!mac_addr || !is_valid_ether_addr(ndev->dev_addr)) {
> + if (IS_ERR(mac_addr) || !is_valid_ether_addr(ndev->dev_addr)) {
> netif_err(ag, probe, ndev, "invalid MAC address, using random address\n");
> eth_random_addr(ndev->dev_addr);
> }
>
>
>
>
Kind regards,
Oleksij Rempel
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] net: ag71xx: fix return value check in ag71xx_probe()
2019-07-17 11:52 [PATCH] net: ag71xx: fix return value check in ag71xx_probe() Wei Yongjun
2019-07-18 7:39 ` Oleksij Rempel
@ 2019-07-18 23:21 ` David Miller
2019-07-19 1:22 ` [PATCH v2] " Wei Yongjun
2 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2019-07-18 23:21 UTC (permalink / raw)
To: weiyongjun1; +Cc: jcliburn, chris.snook, o.rempel, netdev, kernel-janitors
Please resubmit these two ag71xx patches, you use a different subsystem
prefix in the Subject lines, so you should make them consistent.
Using just "ag71xx: " is perfectly fine.
Thank you.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] ag71xx: fix return value check in ag71xx_probe()
2019-07-17 11:52 [PATCH] net: ag71xx: fix return value check in ag71xx_probe() Wei Yongjun
2019-07-18 7:39 ` Oleksij Rempel
2019-07-18 23:21 ` David Miller
@ 2019-07-19 1:22 ` Wei Yongjun
2019-07-19 3:34 ` David Miller
2 siblings, 1 reply; 5+ messages in thread
From: Wei Yongjun @ 2019-07-19 1:22 UTC (permalink / raw)
To: Jay Cliburn, Chris Snook, Oleksij Rempel
Cc: Wei Yongjun, netdev, kernel-janitors
In case of error, the function of_get_mac_address() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().
Fixes: d51b6ce441d3 ("net: ethernet: add ag71xx driver")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
v1 -> v2: fix subsystem prefix
---
drivers/net/ethernet/atheros/ag71xx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c
index 72a57c6cd254..3088a43e6436 100644
--- a/drivers/net/ethernet/atheros/ag71xx.c
+++ b/drivers/net/ethernet/atheros/ag71xx.c
@@ -1732,9 +1732,9 @@ static int ag71xx_probe(struct platform_device *pdev)
ag->stop_desc->next = (u32)ag->stop_desc_dma;
mac_addr = of_get_mac_address(np);
- if (mac_addr)
+ if (!IS_ERR(mac_addr))
memcpy(ndev->dev_addr, mac_addr, ETH_ALEN);
- if (!mac_addr || !is_valid_ether_addr(ndev->dev_addr)) {
+ if (IS_ERR(mac_addr) || !is_valid_ether_addr(ndev->dev_addr)) {
netif_err(ag, probe, ndev, "invalid MAC address, using random address\n");
eth_random_addr(ndev->dev_addr);
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] ag71xx: fix return value check in ag71xx_probe()
2019-07-19 1:22 ` [PATCH v2] " Wei Yongjun
@ 2019-07-19 3:34 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2019-07-19 3:34 UTC (permalink / raw)
To: weiyongjun1; +Cc: jcliburn, chris.snook, o.rempel, netdev, kernel-janitors
From: Wei Yongjun <weiyongjun1@huawei.com>
Date: Fri, 19 Jul 2019 01:22:06 +0000
> In case of error, the function of_get_mac_address() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value check should
> be replaced with IS_ERR().
>
> Fixes: d51b6ce441d3 ("net: ethernet: add ag71xx driver")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-07-19 3:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-17 11:52 [PATCH] net: ag71xx: fix return value check in ag71xx_probe() Wei Yongjun
2019-07-18 7:39 ` Oleksij Rempel
2019-07-18 23:21 ` David Miller
2019-07-19 1:22 ` [PATCH v2] " Wei Yongjun
2019-07-19 3:34 ` David Miller
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).