diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2009-05-05 13:46:08 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-05-06 15:15:04 -0400 |
commit | 358623c22c9fd837b3b1b444377037f72553dc9f (patch) | |
tree | fcf4b4838edde6924157473086e8b7130f120ebd /drivers/net/wireless/rt2x00/rt73usb.c | |
parent | 6cfe62cd58da862db04d4eb61f218f65b0cedbb3 (diff) |
rt2x00: Simplify rt2x00_check_rev
rt2x00_check_rev() was too specific for rt2500usb and rt73usb,
by adding the mask argument (instead of hardcoding it into
the function itself) we can use the function in rt2800usb as
well.
v2: Fix revision mask for rt2800usb
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt73usb.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 6bd28a6bcef2..d10af3687a8e 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -1846,7 +1846,8 @@ static int rt73usb_init_eeprom(struct rt2x00_dev *rt2x00dev) | |||
1846 | rt2x00usb_register_read(rt2x00dev, MAC_CSR0, ®); | 1846 | rt2x00usb_register_read(rt2x00dev, MAC_CSR0, ®); |
1847 | rt2x00_set_chip(rt2x00dev, RT2571, value, reg); | 1847 | rt2x00_set_chip(rt2x00dev, RT2571, value, reg); |
1848 | 1848 | ||
1849 | if (!rt2x00_check_rev(&rt2x00dev->chip, 0x25730)) { | 1849 | if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0x25730) || |
1850 | !rt2x00_check_rev(&rt2x00dev->chip, 0x0000000f, 0)) { | ||
1850 | ERROR(rt2x00dev, "Invalid RT chipset detected.\n"); | 1851 | ERROR(rt2x00dev, "Invalid RT chipset detected.\n"); |
1851 | return -ENODEV; | 1852 | return -ENODEV; |
1852 | } | 1853 | } |