diff options
author | Gertjan van Wingerde <gwingerde@gmail.com> | 2009-11-14 14:20:35 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-16 14:17:12 -0500 |
commit | 16475b095a9c952f16e626c142b30bc95cfeadb3 (patch) | |
tree | 4957c6a7ce58354c50c8e236e1519d1152578f5d /drivers/net/wireless/rt2x00/rt2500pci.c | |
parent | cce5fc45f9e9570f320009431d033d5a8f6144cc (diff) |
rt2x00: Log RT/RF chipset information correctly.
Some drivers (rt2800* most notably) cannot set the RF and RT chipset in
the correct order to have the information logging in rt2x00_set_chip
be correct.
Fix this by decoupling the setting of the chipset information from the
logging of the chipset information so that drivers can determine
themselves when all information is set.
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2500pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index 6618cbd808b3..9a31e5e7b8df 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c | |||
@@ -1505,6 +1505,7 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev) | |||
1505 | value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE); | 1505 | value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE); |
1506 | rt2x00pci_register_read(rt2x00dev, CSR0, ®); | 1506 | rt2x00pci_register_read(rt2x00dev, CSR0, ®); |
1507 | rt2x00_set_chip_rf(rt2x00dev, value, reg); | 1507 | rt2x00_set_chip_rf(rt2x00dev, value, reg); |
1508 | rt2x00_print_chip(rt2x00dev); | ||
1508 | 1509 | ||
1509 | if (!rt2x00_rf(&rt2x00dev->chip, RF2522) && | 1510 | if (!rt2x00_rf(&rt2x00dev->chip, RF2522) && |
1510 | !rt2x00_rf(&rt2x00dev->chip, RF2523) && | 1511 | !rt2x00_rf(&rt2x00dev->chip, RF2523) && |