[PATCH 1/2] net: phy: Add error checks in the driver
Kedareswara rao Appana
appana.durga.rao at xilinx.com
Fri Aug 19 05:48:10 PDT 2016
This patch adds the necessary error checks in the driver.
Reported-by: Andrew Lunn <andrew at lunn.ch>
Signed-off-by: Kedareswara rao Appana <appanad at xilinx.com>
---
drivers/net/phy/xilinx_gmii2rgmii.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
index e7a20ec..7336fd0 100644
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -39,11 +39,16 @@ struct gmii2rgmii {
static int xgmiitorgmii_read_status(struct phy_device *phydev)
{
struct gmii2rgmii *priv = phydev->priv;
- u16 val = 0;
+ int err, val = 0;
- 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);
+ if (val < 0)
+ return val;
+
val &= XILINX_GMII2RGMII_SPEED_MASK;
if (phydev->speed == SPEED_1000)
@@ -53,7 +58,10 @@ static int xgmiitorgmii_read_status(struct phy_device *phydev)
else
val |= BMCR_SPEED10;
- mdiobus_write(phydev->mdio.bus, priv->addr, XILINX_GMII2RGMII_REG, val);
+ err = mdiobus_write(phydev->mdio.bus, priv->addr, XILINX_GMII2RGMII_REG,
+ val);
+ if (err < 0)
+ return err;
return 0;
}
--
2.1.2
More information about the linux-arm-kernel
mailing list