diff options
| author | Vivien Didelot <vivien.didelot@gmail.com> | 2019-08-31 16:18:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-01 12:16:37 -0700 |
| commit | 946bc2509eb88ff0c64dd727a11c5a29b6bc2574 (patch) | |
| tree | 15b0b95c5be37f635574c16621e0232307d7544e /drivers/net/dsa | |
| parent | b943e03341e69cfd384ceabbb4efc28a82f69e0c (diff) | |
| download | linux-stable-946bc2509eb88ff0c64dd727a11c5a29b6bc2574.tar.gz linux-stable-946bc2509eb88ff0c64dd727a11c5a29b6bc2574.tar.bz2 linux-stable-946bc2509eb88ff0c64dd727a11c5a29b6bc2574.zip | |
net: dsa: mv88e6xxx: check errors in mv88e6352_serdes_irq_link
The mv88e6352_serdes_irq_link helper is not checking for any error that
may occur during hardware accesses. Worst, the "up" boolean is set from
the potentially unused "status" variable, if read operations failed.
As done in mv88e6390_serdes_irq_link_sgmii, return right away and do
not call dsa_port_phylink_mac_change if an error occurred.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/serdes.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c index 38c0da2492c0..7eb7ed68c91d 100644 --- a/drivers/net/dsa/mv88e6xxx/serdes.c +++ b/drivers/net/dsa/mv88e6xxx/serdes.c @@ -186,14 +186,19 @@ static void mv88e6352_serdes_irq_link(struct mv88e6xxx_chip *chip, int port) struct dsa_switch *ds = chip->ds; u16 status; bool up; + int err; - mv88e6352_serdes_read(chip, MII_BMSR, &status); + err = mv88e6352_serdes_read(chip, MII_BMSR, &status); + if (err) + return; /* Status must be read twice in order to give the current link * status. Otherwise the change in link status since the last * read of the register is returned. */ - mv88e6352_serdes_read(chip, MII_BMSR, &status); + err = mv88e6352_serdes_read(chip, MII_BMSR, &status); + if (err) + return; up = status & BMSR_LSTATUS; |