diff options
| author | Andrea Merello <andrea.merello@gmail.com> | 2014-03-26 21:00:42 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-27 14:20:08 -0400 |
| commit | f18f112bde931faa25b33f7fa97281be5ef5e2c4 (patch) | |
| tree | da4697db1456280fee1e133825a3dd68a154a701 /drivers/net/wireless/rtl818x | |
| parent | 732c8932060dbc6630ca155d5eb8b484faccef45 (diff) | |
| download | op-kernel-dev-f18f112bde931faa25b33f7fa97281be5ef5e2c4.zip op-kernel-dev-f18f112bde931faa25b33f7fa97281be5ef5e2c4.tar.gz | |
rtl8180: don't write MAR registers for rtl8187se
MAR registers are not present in rtl8187se, and attempting to
write to them must be avoided
Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtl818x')
| -rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180/dev.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c index 92b6d53..cce972d 100644 --- a/drivers/net/wireless/rtl818x/rtl8180/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c @@ -779,8 +779,13 @@ static int rtl8180_start(struct ieee80211_hw *dev) rtl8180_int_enable(dev); - rtl818x_iowrite32(priv, &priv->map->MAR[0], ~0); - rtl818x_iowrite32(priv, &priv->map->MAR[1], ~0); + /* in rtl8187se at MAR regs offset there is the management + * TX descriptor DMA addres.. + */ + if (priv->chip_family != RTL818X_CHIP_FAMILY_RTL8187SE) { + rtl818x_iowrite32(priv, &priv->map->MAR[0], ~0); + rtl818x_iowrite32(priv, &priv->map->MAR[1], ~0); + } reg = RTL818X_RX_CONF_ONLYERLPKT | RTL818X_RX_CONF_RX_AUTORESETPHY | |
