diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2016-07-10 21:02:20 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-07-10 21:07:29 +0300 |
| commit | 8a185006bce519738fe06350aa8d5195e9a1da62 (patch) | |
| tree | 5b10f3cb75949f721cf3f91c2f8ddcc87c06aaae /drivers/net/wireless/realtek/rtl8xxxu | |
| parent | 238ad2ddf34bb3cd13f0f86c0d1b112bf9ef43ac (diff) | |
| parent | 034fdd4a17ff089c2428ece18efa65c5396810d2 (diff) | |
| download | linux-8a185006bce519738fe06350aa8d5195e9a1da62.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
This is to fix some conflicts in iwlwifi.
Conflicts:
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
drivers/net/wireless/intel/iwlwifi/mvm/scan.c
Diffstat (limited to 'drivers/net/wireless/realtek/rtl8xxxu')
| -rw-r--r-- | drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c index b50bf2be3371..9a1994f49b7b 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c @@ -1144,7 +1144,7 @@ static void rtl8192eu_phy_iqcalibrate(struct rtl8xxxu_priv *priv, for (i = 0; i < retry; i++) { path_b_ok = rtl8192eu_rx_iqk_path_b(priv); - if (path_a_ok == 0x03) { + if (path_b_ok == 0x03) { val32 = rtl8xxxu_read32(priv, REG_RX_POWER_BEFORE_IQK_B_2); result[t][6] = (val32 >> 16) & 0x3ff; |