Commit 639dab36 authored Dec 15, 2017 by Russell King Committed by Greg Kroah-Hartman Mar 24, 2018

sfp: fix non-detection of PHY




[ Upstream commit 20b56ed9f8adfb9a7fb1c878878c54aa4ed645c1 ]

The detection of a PHY changed in commit e98a3aab ("mdio_bus: don't
return NULL from mdiobus_scan()") which now causes sfp to print an
error message.  Update for this change.

Fixes: 73970055 ("sfp: add SFP module support")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 1a6610de

drivers/net/phy/sfp.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -318,12 +318,12 @@ static void sfp_sm_probe_phy(struct sfp *sfp)
		msleep(T_PHY_RESET_MS);

		phy = mdiobus_scan(sfp->i2c_mii, SFP_PHY_ADDR);
		if (IS_ERR(phy)) {
		dev_err(sfp->dev, "mdiobus scan returned %ld\n", PTR_ERR(phy));
		if (phy == ERR_PTR(-ENODEV)) {
		dev_info(sfp->dev, "no PHY detected\n");
		return;
		}
		if (!phy) {
		dev_info(sfp->dev, "no PHY detected\n");
		if (IS_ERR(phy)) {
		dev_err(sfp->dev, "mdiobus scan returned %ld\n", PTR_ERR(phy));
		return;
		}