]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
rtl8187: fix compile warning
authorAndrea Merello <andrea.merello@gmail.com>
Fri, 28 Mar 2014 17:12:08 +0000 (18:12 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 31 Mar 2014 17:47:41 +0000 (13:47 -0400)
ANAPARAM3 register, defined in the rtl818x common register
struct, is accessed as 16bit by rtl8187se and as 8bit by rtl8187b.
Since I have no documentation about this, I can only stick to
the reference code and to what is known to work.

This issue has been addressed by a patch from Larry Finger
that introduces an "union", in the register struct.
In my last patch-set I applied it on the register struct, but
I forget to update rtl8187 driver too.
This patch does it.

Suggested-by: Larry Finger <Larry.Finger@lwfinger.net> [ Original patch ]
Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rtl818x/rtl8187/dev.c

index c981bcfb6cef1ed9d9578df88d8d93ac13384e75..2c79bcc6ae65e96e3e604f4c5ffbb4d52daea310 100644 (file)
@@ -592,7 +592,7 @@ static void rtl8187_set_anaparam(struct rtl8187_priv *priv, bool rfon)
        rtl818x_iowrite32(priv, &priv->map->ANAPARAM, anaparam);
        rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, anaparam2);
        if (priv->is_rtl8187b)
-               rtl818x_iowrite8(priv, &priv->map->ANAPARAM3, anaparam3);
+               rtl818x_iowrite8(priv, &priv->map->ANAPARAM3A, anaparam3);
        reg &= ~RTL818X_CONFIG3_ANAPARAM_WRITE;
        rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg);
        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD,