summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Uvarov <muvarov@gmail.com>2017-11-30 13:08:29 +0300
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-12-27 16:28:24 +0100
commit08417b47a781458c258010a3f7debdb7799c3c43 (patch)
tree6ca5bdda153d1f2b48c83c5f24debacedcdceaab
parenta6f40c3a1d659467267a9d16355c788524bc5ca7 (diff)
net: phy-micrel: check return code in flp center function
Fix obvious typo that first return value is set but not checked. Signed-off-by: Max Uvarov <muvarov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit a0da456bbf95d2a9294799bb05c61bfb24736bb7) Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> (cherry picked from commit 5f0a65495d895df2be2ddd681662f877f1a05b7f)
-rw-r--r--drivers/net/phy/micrel.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index aa75f59ce3c8..bb145541fb96 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -498,16 +498,18 @@ static int ksz9031_of_load_skew_values(struct phy_device *phydev,
return ksz9031_extended_write(phydev, OP_DATA, 2, reg, newval);
}
+/* Center KSZ9031RNX FLP timing at 16ms. */
static int ksz9031_center_flp_timing(struct phy_device *phydev)
{
int result;
- /* Center KSZ9031RNX FLP timing at 16ms. */
result = ksz9031_extended_write(phydev, OP_DATA, 0,
MII_KSZ9031RN_FLP_BURST_TX_HI, 0x0006);
+ if (result)
+ return result;
+
result = ksz9031_extended_write(phydev, OP_DATA, 0,
MII_KSZ9031RN_FLP_BURST_TX_LO, 0x1A80);
-
if (result)
return result;