diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2014-03-31 11:45:11 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-03-31 11:45:11 -0500 |
| commit | e365c882ed38dbbe1a6ff4ed72414835390368a6 (patch) | |
| tree | 82eb481631cd22d3767f638cd4d0a3b2598ab61e /drivers/net/wireless/mwifiex/wmm.c | |
| parent | 9ce234e1ee801968b204c3b9caa75ce0a76ed1c2 (diff) | |
| parent | 10f8245e0d3650144b034142c8f91e5d15c392ab (diff) | |
Merge tag 'v3.10.34' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.34-finallinux-lng-3.10.34-2014.04
This is the 3.10.34 stable release
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 ae31e8df44d7..80f72f6b6d56 100644 --- a/drivers/net/wireless/mwifiex/wmm.c +++ b/drivers/net/wireless/mwifiex/wmm.c @@ -556,7 +556,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); } |