Commit c727c6f7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fixed_phy_register-return-value' 



Ruan Jinjie says:

====================
net: Fix return value check for fixed_phy_register()

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

Changes in v3:
- Drop the error fix patch for fixed_phy_get_gpiod().
- Split the error code update code into another patch set as suggested.
- Update the commit title and message.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a0e026e7 32bbe64a

drivers/net/ethernet/broadcom/bgmac.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/net/ethernet/broadcom/genet/bcmmii.c

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ static int bcmgenet_mii_pd_init(struct bcmgenet_priv *priv) 
		};



		phydev = fixed_phy_register(PHY_POLL, &fphy_status, NULL);

		if (!phydev || IS_ERR(phydev)) {

		if (IS_ERR(phydev)) {

			dev_err(kdev, "failed to register fixed PHY device\n");

			return -ENODEV;

		}