aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtl818x/rtl8180/dev.c
diff options
context:
space:
mode:
authorAndrea Merello <andrea.merello@gmail.com>2014-03-26 16:00:42 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-03-27 14:20:08 -0400
commitf18f112bde931faa25b33f7fa97281be5ef5e2c4 (patch)
treeda4697db1456280fee1e133825a3dd68a154a701 /drivers/net/wireless/rtl818x/rtl8180/dev.c
parent732c8932060dbc6630ca155d5eb8b484faccef45 (diff)
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/rtl8180/dev.c')
-rw-r--r--drivers/net/wireless/rtl818x/rtl8180/dev.c9
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 92b6d53ca0ef..cce972d289ef 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)
779 779
780 rtl8180_int_enable(dev); 780 rtl8180_int_enable(dev);
781 781
782 rtl818x_iowrite32(priv, &priv->map->MAR[0], ~0); 782 /* in rtl8187se at MAR regs offset there is the management
783 rtl818x_iowrite32(priv, &priv->map->MAR[1], ~0); 783 * TX descriptor DMA addres..
784 */
785 if (priv->chip_family != RTL818X_CHIP_FAMILY_RTL8187SE) {
786 rtl818x_iowrite32(priv, &priv->map->MAR[0], ~0);
787 rtl818x_iowrite32(priv, &priv->map->MAR[1], ~0);
788 }
784 789
785 reg = RTL818X_RX_CONF_ONLYERLPKT | 790 reg = RTL818X_RX_CONF_ONLYERLPKT |
786 RTL818X_RX_CONF_RX_AUTORESETPHY | 791 RTL818X_RX_CONF_RX_AUTORESETPHY |