diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-22 11:18:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-22 11:18:40 -0700 |
| commit | d14a7679ae9b7d4eb4b92e81f5039b719fd98c4d (patch) | |
| tree | cb12e313178092e92136704660d68f7ce6578d19 /drivers/net/wireless/rt2x00/rt2500usb.c | |
| parent | de72e5de062e48a992d6cafe2291a82fe498d641 (diff) | |
| parent | 154839962a582b8eb661cde94ef3af0e03b374d7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500usb.c')
| -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; } |