lkml.org 
[lkml]   [2018]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 60/87] net: phy: xgmiitorgmii: Check read_status results
    Date
    From: Brandon Maier <brandon.maier@rockwellcollins.com>

    [ 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>
    ---
    drivers/net/phy/xilinx_gmii2rgmii.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
    index 2e5150b0b8d5..449b31319010 100644
    --- a/drivers/net/phy/xilinx_gmii2rgmii.c
    +++ b/drivers/net/phy/xilinx_gmii2rgmii.c
    @@ -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;
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-17 05:05    [W:4.212 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site