Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 155865
b: refs/heads/master
c: 7adfd5c
h: refs/heads/master
i:
  155863: 3bd5da7
v: v3
  • Loading branch information
Andy Whitcroft authored and John W. Linville committed Jul 21, 2009
1 parent d938ca7 commit 3edddd1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6c95e2a2f0f0bf4c8880d5b74b2f7f359d352d03
refs/heads/master: 7adfd5c71693b81e995283805b17aa4a2ee0ecd9
4 changes: 3 additions & 1 deletion trunk/drivers/net/wireless/rt2x00/rt2500usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1550,7 +1550,9 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
rt2500usb_register_read(rt2x00dev, MAC_CSR0, &reg);
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;
}
Expand Down

0 comments on commit 3edddd1

Please sign in to comment.