diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-10-16 17:06:54 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-10-16 17:09:24 +0300 |
| commit | 0fac9e2dff00a2344ffc81d82749181ffae408a2 (patch) | |
| tree | 1399ce5ce12955c971c4727dd70bc8b4db2754f1 /drivers/net/wireless/realtek/rtlwifi | |
| parent | a39644b235c1a45f84d6e16603cacb93740ed2d4 (diff) | |
| parent | a6127b4440d1f74f26b64006b2f50c9dc6d66efc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
Mark Brown reported that there are conflicts in iwlwifi between the two trees
so fix those now.
Diffstat (limited to 'drivers/net/wireless/realtek/rtlwifi')
| -rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c index 6e683458a59d..6408bc8456f3 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c @@ -1123,7 +1123,7 @@ static u8 _rtl8821ae_dbi_read(struct rtl_priv *rtlpriv, u16 addr) } if (0 == tmp) { read_addr = REG_DBI_RDATA + addr % 4; - ret = rtl_read_byte(rtlpriv, read_addr); + ret = rtl_read_word(rtlpriv, read_addr); } return ret; } |