diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-04 19:05:12 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-04 19:05:12 +0100 |
| commit | f3b6a488a670f1be2666ab97e31dcfc0b1648884 (patch) | |
| tree | d8d2431f21d4371c907dec075926e86840e86d1e /drivers/net/wireless/mwifiex/wmm.c | |
| parent | wil6210: fix smatch warning in wil_cfg80211_get_station() (diff) | |
| parent | mwifiex: do not advertise usb autosuspend support (diff) | |
| download | linux-f3b6a488a670f1be2666ab97e31dcfc0b1648884.tar.xz linux-f3b6a488a670f1be2666ab97e31dcfc0b1648884.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/mwifiex/pcie.c
Diffstat (limited to 'drivers/net/wireless/mwifiex/wmm.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/wmm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c index e0ba0115e5ae..1c5f2b66f057 100644 --- a/drivers/net/wireless/mwifiex/wmm.c +++ b/drivers/net/wireless/mwifiex/wmm.c @@ -554,7 +554,8 @@ mwifiex_clean_txrx(struct mwifiex_private *priv) mwifiex_wmm_delete_all_ralist(priv); memcpy(tos_to_tid, ac_to_tid, sizeof(tos_to_tid)); - if (priv->adapter->if_ops.clean_pcie_ring) + if (priv->adapter->if_ops.clean_pcie_ring && + !priv->adapter->surprise_removed) priv->adapter->if_ops.clean_pcie_ring(priv->adapter); spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, flags); |