diff options
| author | Vivien Didelot | 2015-08-03 15:17:44 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-08-04 00:46:09 +0200 |
| commit | 24751e29fe313105c9dd5f9d1f27028c553381f6 (patch) | |
| tree | 7d33adae616121265e969337ea9f0eea853813f9 /drivers/net/dsa | |
| parent | bridge: mdb: add/del entry on all vlans if vlan_filter is enabled and vid is 0 (diff) | |
| download | kernel-qcow2-linux-24751e29fe313105c9dd5f9d1f27028c553381f6.tar.gz kernel-qcow2-linux-24751e29fe313105c9dd5f9d1f27028c553381f6.tar.xz kernel-qcow2-linux-24751e29fe313105c9dd5f9d1f27028c553381f6.zip | |
net: dsa: mv88e6xxx: call _mv88e6xxx_stats_wait with SMI lock held
At switch setup, _mv88e6xxx_stats_wait was called without holding the
SMI mutex. Fix this by requesting the lock for this call.
Also, return the _mv88e6xxx_stats_wait code, since it may fail.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index 61ce4cf120a6..109452056eff 100644 --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c @@ -1881,6 +1881,7 @@ int mv88e6xxx_setup_common(struct dsa_switch *ds) int mv88e6xxx_setup_global(struct dsa_switch *ds) { struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); + int ret; int i; /* Set the default address aging time to 5 minutes, and @@ -1979,9 +1980,11 @@ int mv88e6xxx_setup_global(struct dsa_switch *ds) REG_WRITE(REG_GLOBAL, GLOBAL_STATS_OP, GLOBAL_STATS_OP_FLUSH_ALL); /* Wait for the flush to complete. */ - _mv88e6xxx_stats_wait(ds); + mutex_lock(&ps->smi_mutex); + ret = _mv88e6xxx_stats_wait(ds); + mutex_unlock(&ps->smi_mutex); - return 0; + return ret; } int mv88e6xxx_switch_reset(struct dsa_switch *ds, bool ppu_active) |