]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
rtl8187: avoid redundant write to register FF72 (RFSW_CTRL)
authorHerton Ronaldo Krzesinski <herton@mandriva.com.br>
Tue, 2 Nov 2010 00:59:34 +0000 (22:59 -0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 15 Nov 2010 18:25:42 +0000 (13:25 -0500)
The table with misc register initialization was setting it, and later
on we would set it again with a explicity call to rtl818x_iowrite16_idx.

Remove duplicate initialization from the register table.

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rtl818x/rtl8187_dev.c

index b9ce2a8739cd781d6d18c176f8483e75e80dc35d..063374aba863b38c7de38d31ad982a1bfd2ccf84 100644 (file)
@@ -722,8 +722,7 @@ static const u8 rtl8187b_reg_table[][3] = {
        {0x52, 0x04, 2}, {0x53, 0xA0, 2}, {0x54, 0x1F, 2}, {0x55, 0x23, 2},
        {0x56, 0x45, 2}, {0x57, 0x67, 2}, {0x58, 0x08, 2}, {0x59, 0x08, 2},
        {0x5A, 0x08, 2}, {0x5B, 0x08, 2}, {0x60, 0x08, 2}, {0x61, 0x08, 2},
-       {0x62, 0x08, 2}, {0x63, 0x08, 2}, {0x64, 0xCF, 2}, {0x72, 0x56, 2},
-       {0x73, 0x9A, 2},
+       {0x62, 0x08, 2}, {0x63, 0x08, 2}, {0x64, 0xCF, 2},
 
        {0x5B, 0x40, 0}, {0x84, 0x88, 0}, {0x85, 0x24, 0}, {0x88, 0x54, 0},
        {0x8B, 0xB8, 0}, {0x8C, 0x07, 0}, {0x8D, 0x00, 0}, {0x94, 0x1B, 0},
@@ -810,6 +809,7 @@ static int rtl8187b_init_hw(struct ieee80211_hw *dev)
 
        rtl818x_iowrite32(priv, &priv->map->RF_TIMING, 0x00004001);
 
+       /* RFSW_CTRL register */
        rtl818x_iowrite16_idx(priv, (__le16 *)0xFF72, 0x569A, 2);
 
        rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD,