Commit 065e1ae0 authored by Florian Fainelli's avatar Florian Fainelli Committed by Jakub Kicinski
Browse files

Revert "net: phy: fixed_phy: Fix NULL vs IS_ERR() checking in __fixed_phy_register" 



This reverts commit b45396af ("net: phy:
fixed_phy: Fix NULL vs IS_ERR() checking in __fixed_phy_register")
since it prevents any system that uses a fixed PHY without a GPIO
descriptor from properly working:

[    5.971952] brcm-systemport 9300000.ethernet: failed to register fixed PHY
[    5.978854] brcm-systemport: probe of 9300000.ethernet failed with error -22
[    5.986047] brcm-systemport 9400000.ethernet: failed to register fixed PHY
[    5.992947] brcm-systemport: probe of 9400000.ethernet failed with error -22

Fixes: b45396af ("net: phy: fixed_phy: Fix NULL vs IS_ERR() checking in __fixed_phy_register")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20220103193453.1214961-1-f.fainelli@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 95bdba23

drivers/net/phy/fixed_phy.c

+2 −2
Original line number Diff line number Diff line
@@ -239,8 +239,8 @@ static struct phy_device *__fixed_phy_register(unsigned int irq, 
	/* Check if we have a GPIO associated with this fixed phy */

	if (!gpiod) {

		gpiod = fixed_phy_get_gpiod(np);

		if (!gpiod)

			return ERR_PTR(-EINVAL);

		if (IS_ERR(gpiod))

			return ERR_CAST(gpiod);

	}



	/* Get the next available PHY address, up to PHY_MAX_ADDR */