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/rt2500usb.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/rt2500usb.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2500usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index bb64473dae67..b2de43e4f656 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c | |||
@@ -1409,6 +1409,7 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev) | |||
1409 | value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE); | 1409 | value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE); |
1410 | rt2500usb_register_read(rt2x00dev, MAC_CSR0, ®); | 1410 | rt2500usb_register_read(rt2x00dev, MAC_CSR0, ®); |
1411 | rt2x00_set_chip(rt2x00dev, RT2570, value, reg); | 1411 | rt2x00_set_chip(rt2x00dev, RT2570, value, reg); |
1412 | rt2x00_print_chip(rt2x00dev); | ||
1412 | 1413 | ||
1413 | if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0) || | 1414 | if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0) || |
1414 | rt2x00_check_rev(&rt2x00dev->chip, 0x0000000f, 0)) { | 1415 | rt2x00_check_rev(&rt2x00dev->chip, 0x0000000f, 0)) { |