rtl8xxxu: Pause TX before calling disable_rf()

All the disable_rf() functions were setting REG_TXPAUSE to 0xff to
stop transmission. Do it centrally before calling disable_rf()
instead.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
index a86b5c40efe4cff4c058e9319d4008add7763a86..928ca56f751c86ba5ee2fa53dcc47f1c07f3dd49 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
@@ -2125,8 +2125,6 @@ static void rtl8723a_disable_rf(struct rtl8xxxu_priv *priv)
        u8 sps0;
        u32 val32;
 
-       rtl8xxxu_write8(priv, REG_TXPAUSE, 0xff);
-
        sps0 = rtl8xxxu_read8(priv, REG_SPS0_CTRL);
 
        /* RF RX code for preamble power saving */
@@ -7665,8 +7663,6 @@ static void rtl8723b_disable_rf(struct rtl8xxxu_priv *priv)
 {
        u32 val32;
 
-       rtl8xxxu_write8(priv, REG_TXPAUSE, 0xff);
-
        val32 = rtl8xxxu_read32(priv, REG_RX_WAIT_CCA);
        val32 &= ~(BIT(22) | BIT(23));
        rtl8xxxu_write32(priv, REG_RX_WAIT_CCA, val32);
@@ -9591,6 +9587,8 @@ static void rtl8xxxu_stop(struct ieee80211_hw *hw)
        if (priv->usb_interrupts)
                usb_kill_anchored_urbs(&priv->int_anchor);
 
+       rtl8xxxu_write8(priv, REG_TXPAUSE, 0xff);
+
        priv->fops->disable_rf(priv);
 
        /*