diff options
author | Gertjan van Wingerde <gwingerde@gmail.com> | 2009-12-30 05:36:31 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-12 13:51:23 -0500 |
commit | 6c0fe26581406bff3d15fd6051453e80cfe70fd6 (patch) | |
tree | b8793f5964c4de8b248fbf50a3facb0390887a17 /drivers/net/wireless/rt2x00 | |
parent | 13ae75b103e07304a34ab40c9136e9f53e06475c (diff) |
rt2x00: RF3052 is a valid RF chipset for USB devices as well.
The RF3052 chipset is now also being integrated onto USB devices, so
allow the RF chipset and don't treat it as PCI/SOC only.
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')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 126899091707..d300ff84b717 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c | |||
@@ -1862,7 +1862,8 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) | |||
1862 | !rt2x00_rf(rt2x00dev, RF3020) && | 1862 | !rt2x00_rf(rt2x00dev, RF3020) && |
1863 | !rt2x00_rf(rt2x00dev, RF2020) && | 1863 | !rt2x00_rf(rt2x00dev, RF2020) && |
1864 | !rt2x00_rf(rt2x00dev, RF3021) && | 1864 | !rt2x00_rf(rt2x00dev, RF3021) && |
1865 | !rt2x00_rf(rt2x00dev, RF3022)) { | 1865 | !rt2x00_rf(rt2x00dev, RF3022) && |
1866 | !rt2x00_rf(rt2x00dev, RF3052)) { | ||
1866 | ERROR(rt2x00dev, "Invalid RF chipset detected.\n"); | 1867 | ERROR(rt2x00dev, "Invalid RF chipset detected.\n"); |
1867 | return -ENODEV; | 1868 | return -ENODEV; |
1868 | } | 1869 | } |
@@ -2047,7 +2048,7 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) | |||
2047 | 2048 | ||
2048 | if (rt2x00_rf(rt2x00dev, RF2820) || | 2049 | if (rt2x00_rf(rt2x00dev, RF2820) || |
2049 | rt2x00_rf(rt2x00dev, RF2720) || | 2050 | rt2x00_rf(rt2x00dev, RF2720) || |
2050 | (rt2x00_intf_is_pci(rt2x00dev) && rt2x00_rf(rt2x00dev, RF3052))) { | 2051 | rt2x00_rf(rt2x00dev, RF3052)) { |
2051 | spec->num_channels = 14; | 2052 | spec->num_channels = 14; |
2052 | spec->channels = rf_vals; | 2053 | spec->channels = rf_vals; |
2053 | } else if (rt2x00_rf(rt2x00dev, RF2850) || rt2x00_rf(rt2x00dev, RF2750)) { | 2054 | } else if (rt2x00_rf(rt2x00dev, RF2850) || rt2x00_rf(rt2x00dev, RF2750)) { |