| From 9278db6279e28d4d433bc8a848e10b4ece8793ed Mon Sep 17 00:00:00 2001 |
| From: Larry Finger <Larry.Finger@lwfinger.net> |
| Date: Wed, 11 Dec 2013 17:13:10 -0600 |
| Subject: rtlwifi: pci: Fix oops on driver unload |
| |
| From: Larry Finger <Larry.Finger@lwfinger.net> |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/wireless/rtlwifi/pci.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/wireless/rtlwifi/pci.c |
| +++ b/drivers/net/wireless/rtlwifi/pci.c |
| @@ -678,6 +678,8 @@ static void _rtl_pci_rx_interrupt(struct |
| }; |
| int index = rtlpci->rx_ring[rx_queue_idx].idx; |
| |
| + if (rtlpci->driver_is_goingto_unload) |
| + return; |
| /*RX NORMAL PKT */ |
| while (count--) { |
| /*rx descriptor */ |
| @@ -1553,6 +1555,7 @@ static void rtl_pci_stop(struct ieee8021 |
| */ |
| set_hal_stop(rtlhal); |
| |
| + rtlpci->driver_is_goingto_unload = true; |
| rtlpriv->cfg->ops->disable_interrupt(hw); |
| cancel_work_sync(&rtlpriv->works.lps_leave_work); |
| |
| @@ -1570,7 +1573,6 @@ static void rtl_pci_stop(struct ieee8021 |
| 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); |
| /* some things are not needed if firmware not available */ |
| if (!rtlpriv->max_fw_size) |
