From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Miaoqian Lin <linmq006@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
opendmb@gmail.com, kuba@kernel.org,
bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 08/19] net: bcmgenet: Fix NULL vs IS_ERR() checking
Date: Mon, 20 Dec 2021 20:59:03 -0500 [thread overview]
Message-ID: <20211221015914.116767-8-sashal@kernel.org> (raw)
In-Reply-To: <20211221015914.116767-1-sashal@kernel.org>
From: Miaoqian Lin <linmq006@gmail.com>
[ Upstream commit ab8eb798ddabddb2944401bf31ead9671cb97d95 ]
The phy_attach() function does not return NULL. It returns error pointers.
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/broadcom/genet/bcmmii.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index f9e91304d2327..2b67e335bc54e 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -557,9 +557,9 @@ static int bcmgenet_mii_pd_init(struct bcmgenet_priv *priv)
* Internal or external PHY with MDIO access
*/
phydev = phy_attach(priv->dev, phy_name, pd->phy_interface);
- if (!phydev) {
+ if (IS_ERR(phydev)) {
dev_err(kdev, "failed to register PHY device\n");
- return -ENODEV;
+ return PTR_ERR(phydev);
}
} else {
/*
--
2.34.1
next prev parent reply other threads:[~2021-12-21 2:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-21 1:58 [PATCH AUTOSEL 5.10 01/19] ARM: dts: ls1021a-tsn: update RGMII delays for sja1105 switch Sasha Levin
2021-12-21 1:58 ` [PATCH AUTOSEL 5.10 02/19] ARM: rockchip: Use memcpy_toio instead of memcpy on smp bring-up Sasha Levin
2021-12-21 1:58 ` [PATCH AUTOSEL 5.10 03/19] mac80211: set up the fwd_skb->dev for mesh forwarding Sasha Levin
2021-12-21 1:58 ` [PATCH AUTOSEL 5.10 04/19] mac80211: fix a memory leak where sta_info is not freed Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 05/19] nl80211: reset regdom when reloading regdb Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 06/19] iwlwifi: fix LED dependencies Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 07/19] phonet: refcount leak in pep_sock_accep Sasha Levin
2021-12-21 1:59 ` Sasha Levin [this message]
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 09/19] scsi: pm8001: Fix phys_to_virt() usage on dma_addr_t Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 10/19] mac80211: Fix the size used for building probe request Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 11/19] mac80211: update channel context before station state Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 12/19] mac80211: do drv_reconfig_complete() before restarting all Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 13/19] drm/amd/display: Reset DMCUB before HW init Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 14/19] drm/amdgpu: correct the wrong cached state for GMC on PICASSO Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 15/19] block: reduce kblockd_mod_delayed_work_on() CPU consumption Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 16/19] net: usb: lan78xx: add Allied Telesis AT29M2-AF Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 17/19] virtio_net: fix rx_drops stat for small pkts Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 18/19] bpf: Make 32->64 bounds propagation slightly more robust Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 19/19] Revert "block: reduce kblockd_mod_delayed_work_on() CPU consumption" Sasha Levin
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=20211221015914.116767-8-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linmq006@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=opendmb@gmail.com \
--cc=stable@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;
as well as URLs for NNTP newsgroup(s).