| Message ID | 20200319124819.369431-1-antoine.tenart@bootlin.com |
|---|---|
| State | New |
| Headers | show |
| Series | [net-next] net: phy: mscc: add missing check on a phy_write return value | expand |
diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c index 2f6229a70ec1..bc6beec8aff0 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -1411,6 +1411,8 @@ static int vsc8584_config_init(struct phy_device *phydev) val |= (MEDIA_OP_MODE_COPPER << MEDIA_OP_MODE_POS) | (VSC8584_MAC_IF_SELECTION_SGMII << VSC8584_MAC_IF_SELECTION_POS); ret = phy_write(phydev, MSCC_PHY_EXT_PHY_CNTL_1, val); + if (ret) + return ret; ret = genphy_soft_reset(phydev); if (ret)
Commit a5afc1678044 ("net: phy: mscc: add support for VSC8584 PHY") introduced a call to 'phy_write' storing its return value to a variable called 'ret'. But 'ret' never was checked for a possible error being returned, and hence was not used at all. Fix this by checking the return value and exiting the function if an error was returned. As this does not fix a known bug, this commit is mostly cosmetic and not sent as a fix. Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> --- drivers/net/phy/mscc/mscc_main.c | 2 ++ 1 file changed, 2 insertions(+)