]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: bgmac: Fix return value check for fixed_phy_register()
authorRuan Jinjie <ruanjinjie@huawei.com>
Fri, 18 Aug 2023 05:12:20 +0000 (13:12 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 30 Oct 2023 11:00:24 +0000 (12:00 +0100)
BugLink: https://bugs.launchpad.net/bugs/2039742
[ Upstream commit 23a14488ea5882dea5851b65c9fce2127ee8fcad ]

The fixed_phy_register() function returns error pointers and never
returns NULL. Update the checks accordingly.

Fixes: c25b23b8a387 ("bgmac: register fixed PHY for ARM BCM470X / BCM5301X chipsets")
Signed-off-by: Ruan Jinjie <ruanjinjie@huawei.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/net/ethernet/broadcom/bgmac.c

index 10c7c232cc4ecce0d719435c8f3b14060de0dc58..52ee3751187a2836867b650a5f1128161cb33a52 100644 (file)
@@ -1448,7 +1448,7 @@ int bgmac_phy_connect_direct(struct bgmac *bgmac)
        int err;
 
        phy_dev = fixed_phy_register(PHY_POLL, &fphy_status, NULL);
-       if (!phy_dev || IS_ERR(phy_dev)) {
+       if (IS_ERR(phy_dev)) {
                dev_err(bgmac->dev, "Failed to register fixed PHY device\n");
                return -ENODEV;
        }