diff options
author | David S. Miller | 2019-07-09 04:48:57 +0200 |
---|---|---|
committer | David S. Miller | 2019-07-09 04:48:57 +0200 |
commit | af144a983402f7fd324ce556d9f9011a8b3e01fe (patch) | |
tree | 7a0250b960a36976bc683789d9fe86b9f60a97a5 /drivers/net/dsa/mv88e6xxx | |
parent | skbuff: increase verbosity when dumping skb data (diff) | |
parent | tcp: Reset bytes_acked and bytes_received when disconnecting (diff) | |
download | kernel-qcow2-linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.tar.gz kernel-qcow2-linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.tar.xz kernel-qcow2-linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two cases of overlapping changes, nothing fancy.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/mv88e6xxx')
-rw-r--r-- | drivers/net/dsa/mv88e6xxx/chip.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 40b1fb22d8df..6b17cd961d06 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -4786,6 +4786,8 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) err = PTR_ERR(chip->reset); goto out; } + if (chip->reset) + usleep_range(1000, 2000); err = mv88e6xxx_detect(chip); if (err) |