diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2013-12-11 17:13:10 -0600 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-02-15 19:20:14 +0000 |
| commit | b1d579f59db6b84485497e0c15237348f15c60f2 (patch) | |
| tree | 2d3c01713cfcec0ee5a995856566e86df943a499 /drivers/net/wireless | |
| parent | cee7e2f6b271c36ee0bf3cc3836cbde77301d10e (diff) | |
| download | kernel_samsung_smdk4412-b1d579f59db6b84485497e0c15237348f15c60f2.zip kernel_samsung_smdk4412-b1d579f59db6b84485497e0c15237348f15c60f2.tar.gz kernel_samsung_smdk4412-b1d579f59db6b84485497e0c15237348f15c60f2.tar.bz2 | |
rtlwifi: pci: Fix oops on driver unload
commit 9278db6279e28d4d433bc8a848e10b4ece8793ed upstream.
On Fedora systems, unloading rtl8192ce causes an oops. This patch fixes the
problem reported at https://bugzilla.redhat.com/show_bug.cgi?id=852761.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index 47ba0f7..38b793b 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c @@ -685,6 +685,8 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) }; int index = rtlpci->rx_ring[rx_queue_idx].idx; + if (rtlpci->driver_is_goingto_unload) + return; /*RX NORMAL PKT */ while (count--) { /*rx descriptor */ @@ -1563,6 +1565,7 @@ static void rtl_pci_stop(struct ieee80211_hw *hw) */ set_hal_stop(rtlhal); + rtlpci->driver_is_goingto_unload = true; rtlpriv->cfg->ops->disable_interrupt(hw); tasklet_kill(&rtlpriv->works.ips_leave_tasklet); @@ -1580,7 +1583,6 @@ static void rtl_pci_stop(struct ieee80211_hw *hw) ppsc->rfchange_inprogress = true; spin_unlock_irqrestore(&rtlpriv->locks.rf_ps_lock, flags); - rtlpci->driver_is_goingto_unload = true; rtlpriv->cfg->ops->hw_disable(hw); rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_OFF); |