diff options
| author | David S. Miller <davem@davemloft.net> | 2019-10-15 19:40:57 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-15 19:40:57 +0300 |
| commit | 9cb0aec9ad370163b4cb038d9538baceadb345de (patch) | |
| tree | 4e70a70e70984c96d0e2f21886cf9a5a01c3d39f /drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | |
| parent | 8c16b55bbf8417602f3d2ba9efd79bffce1a1bd0 (diff) | |
| parent | d79749f7716d9dc32fa2d5075f6ec29aac63c76d (diff) | |
| download | linux-9cb0aec9ad370163b4cb038d9538baceadb345de.tar.xz | |
Merge tag 'wireless-drivers-for-davem-2019-10-15' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says:
====================
wireless-drivers fixes for 5.4
Second set of fixes for 5.4. ath10k regression and iwlwifi BAD_COMMAND
bug are the ones getting most reports at the moment.
ath10k
* fix throughput regression on QCA98XX
iwlwifi
* fix initialization of 3168 devices (the infamous BAD_COMMAND bug)
* other smaller fixes
rt2x00
* don't include input-polldev.h header
* fix hw reset to work during first 5 minutes of system run
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ralink/rt2x00/rt2x00debug.c')
| -rw-r--r-- | drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c index 4d4e3888ef20..f2395309ec00 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c @@ -555,7 +555,7 @@ static ssize_t rt2x00debug_write_restart_hw(struct file *file, { struct rt2x00debug_intf *intf = file->private_data; struct rt2x00_dev *rt2x00dev = intf->rt2x00dev; - static unsigned long last_reset; + static unsigned long last_reset = INITIAL_JIFFIES; if (!rt2x00_has_cap_restart_hw(rt2x00dev)) return -EOPNOTSUPP; |