Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40b368af authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtlwifi: Fix alignment issues 



The addresses of Wlan NIC registers are natural alignment, but some
drivers have bugs. These are evident on platforms that need natural
alignment to access registers.  This change contains the following:
 1. Function _rtl8821ae_dbi_read() is used to read one byte from DBI,
    thus it should use rtl_read_byte().
 2. Register 0x4C7 of 8192ee is single byte.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 26eb994d

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ static void _rtl92ee_hw_configure(struct ieee80211_hw *hw) 
	rtl_write_word(rtlpriv, REG_SIFS_TRX, 0x100a);



	/* Note Data sheet don't define */

	rtl_write_word(rtlpriv, 0x4C7, 0x80);

	rtl_write_byte(rtlpriv, 0x4C7, 0x80);



	rtl_write_byte(rtlpriv, REG_RX_PKT_LIMIT, 0x20);

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1127,7 +1127,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_word(rtlpriv, read_addr);

		ret = rtl_read_byte(rtlpriv, read_addr);

	}

	return ret;

}