diff options
| author | Andy Whitcroft <apw@canonical.com> | 2009-07-16 16:28:11 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-07-21 12:07:43 -0400 |
| commit | 7adfd5c71693b81e995283805b17aa4a2ee0ecd9 (patch) | |
| tree | a5937e527809ef7dc4f0decf71afbe8b4587af22 | |
| parent | 6c95e2a2f0f0bf4c8880d5b74b2f7f359d352d03 (diff) | |
| download | linux-3.10-7adfd5c71693b81e995283805b17aa4a2ee0ecd9.tar.gz linux-3.10-7adfd5c71693b81e995283805b17aa4a2ee0ecd9.tar.bz2 linux-3.10-7adfd5c71693b81e995283805b17aa4a2ee0ecd9.zip | |
rt2x00: Fix chipset detection for rt2500usb
The commit below changed the semantics of rt2x00_check_rev so that it no
longer checked the bottom 4 bits of the rev were non-zero. During that
conversion this part of the check was not propogated to the rt2500usb
initialisation.
commit 358623c22c9fd837b3b1b444377037f72553dc9f
Author: Ivo van Doorn <ivdoorn@gmail.com>
Date: Tue May 5 19:46:08 2009 +0200
rt2x00: Simplify rt2x00_check_rev
Without this check rt73 devices are miss recognised as rt2500 devices and
two drivers are loaded. Preventing the device being used. Reinstate this
check.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2500usb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index 66daf68ff0e..ce75426764a 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c @@ -1550,7 +1550,9 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev) rt2500usb_register_read(rt2x00dev, MAC_CSR0, ®); rt2x00_set_chip(rt2x00dev, RT2570, value, reg); - if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0)) { + if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0) || + rt2x00_check_rev(&rt2x00dev->chip, 0x0000000f, 0)) { + ERROR(rt2x00dev, "Invalid RT chipset detected.\n"); return -ENODEV; } |