Skip to content

Commit

Permalink
rtl8xxxu: Set correct interrupt masking registers on 8192eu
Browse files Browse the repository at this point in the history
Set HIMR[01] on 8192eu instead of HISR/HIMR. It's not obvious this
really matters for USB devices, but this matches the register writes
performed by the vendor driver.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  • Loading branch information
Jes Sorensen authored and Kalle Valo committed Apr 14, 2016
1 parent 8a59485 commit 57e5e2e
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
Original file line number Diff line number Diff line change
Expand Up @@ -6883,11 +6883,6 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
rtl8xxxu_write8(priv, 0xfe42, 0x80);
}

if (priv->rtl_chip == RTL8192E) {
rtl8xxxu_write32(priv, REG_HIMR0, 0x00);
rtl8xxxu_write32(priv, REG_HIMR1, 0x00);
}

if (priv->fops->phy_init_antenna_selection)
priv->fops->phy_init_antenna_selection(priv);

Expand Down Expand Up @@ -7053,11 +7048,16 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
*/
rtl8xxxu_write8(priv, REG_RX_DRVINFO_SZ, 4);

/*
* Enable all interrupts - not obvious USB needs to do this
*/
rtl8xxxu_write32(priv, REG_HISR, 0xffffffff);
rtl8xxxu_write32(priv, REG_HIMR, 0xffffffff);
if (priv->rtl_chip == RTL8192E) {
rtl8xxxu_write32(priv, REG_HIMR0, 0x00);
rtl8xxxu_write32(priv, REG_HIMR1, 0x00);
} else {
/*
* Enable all interrupts - not obvious USB needs to do this
*/
rtl8xxxu_write32(priv, REG_HISR, 0xffffffff);
rtl8xxxu_write32(priv, REG_HIMR, 0xffffffff);
}

rtl8xxxu_set_mac(priv);
rtl8xxxu_set_linktype(priv, NL80211_IFTYPE_STATION);
Expand Down

0 comments on commit 57e5e2e

Please sign in to comment.