aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorVivien Didelot <vivien.didelot@gmail.com>2019-08-28 12:26:11 -0400
committerDavid S. Miller <davem@davemloft.net>2019-08-29 17:20:04 -0700
commitb98f0f530d7978157b553a97556c5cc6489b3108 (patch)
tree8933dae4ba76e30e1090249e2e6f6e3404fd54c9 /drivers/net
parentMerge branch 'net-hns3-add-some-cleanups-and-optimizations' (diff)
downloadlinux-dev-b98f0f530d7978157b553a97556c5cc6489b3108.tar.xz
linux-dev-b98f0f530d7978157b553a97556c5cc6489b3108.zip
net: dsa: mv88e6xxx: get serdes lane after lock
This is a follow-up patch for commit 17deaf5cb37a ("net: dsa: mv88e6xxx: create serdes_get_lane chip operation"). The .serdes_get_lane implementations access the CMODE of a port, even though it is cached at the moment, it is safer to call them after the mutex is locked, not before. At the same time, check for an eventual error and return IRQ_DONE, instead of blindly ignoring it. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com> Reviewed-by: Marek BehĂșn <marek.behun@nic.cz> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/dsa/mv88e6xxx/serdes.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c
index 9424e401dbc7..38c0da2492c0 100644
--- a/drivers/net/dsa/mv88e6xxx/serdes.c
+++ b/drivers/net/dsa/mv88e6xxx/serdes.c
@@ -646,10 +646,12 @@ static irqreturn_t mv88e6390_serdes_thread_fn(int irq, void *dev_id)
int err;
u8 lane;
- mv88e6xxx_serdes_get_lane(chip, port->port, &lane);
-
mv88e6xxx_reg_lock(chip);
+ err = mv88e6xxx_serdes_get_lane(chip, port->port, &lane);
+ if (err)
+ goto out;
+
switch (cmode) {
case MV88E6XXX_PORT_STS_CMODE_SGMII:
case MV88E6XXX_PORT_STS_CMODE_1000BASEX: