| From b055902a4ba6a0a334604285cf9700ae9f96527b Mon Sep 17 00:00:00 2001 |
| From: Max Uvarov <muvarov@gmail.com> |
| Date: Thu, 30 Nov 2017 13:08:29 +0300 |
| Subject: [PATCH 0113/1795] 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: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/net/phy/micrel.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c |
| index 6c45ff650ec7..422ff6333c52 100644 |
| --- a/drivers/net/phy/micrel.c |
| +++ b/drivers/net/phy/micrel.c |
| @@ -496,16 +496,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; |
| |
| -- |
| 2.19.0 |
| |
