]> git.itanic.dy.fi Git - linux-stable/commitdiff
net: phy: xgmiitorgmii: Check read_status results
authorBrandon Maier <brandon.maier@rockwellcollins.com>
Tue, 26 Jun 2018 17:50:50 +0000 (12:50 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Oct 2018 00:00:51 +0000 (17:00 -0700)
[ Upstream commit 8d0752d11312be830c33e84dfd1016e6a47c2938 ]

We're ignoring the result of the attached phy device's read_status().
Return it so we can detect errors.

Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
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>
drivers/net/phy/xilinx_gmii2rgmii.c

index 2e5150b0b8d52c5dd784a3df1818962d64972898..449b313190109e66713c004ae3318099129c5389 100644 (file)
@@ -40,8 +40,11 @@ static int xgmiitorgmii_read_status(struct phy_device *phydev)
 {
        struct gmii2rgmii *priv = phydev->priv;
        u16 val = 0;
+       int err;
 
-       priv->phy_drv->read_status(phydev);
+       err = priv->phy_drv->read_status(phydev);
+       if (err < 0)
+               return err;
 
        val = mdiobus_read(phydev->mdio.bus, priv->addr, XILINX_GMII2RGMII_REG);
        val &= ~XILINX_GMII2RGMII_SPEED_MASK;