aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/rt2x00/rt2800lib.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index fcd0c88d5f04..02ffcf54bf09 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -217,14 +217,12 @@ void rt2800_mcu_request(struct rt2x00_dev *rt2x00dev,
217{ 217{
218 u32 reg; 218 u32 reg;
219 219
220 if (rt2x00_intf_is_pci(rt2x00dev)) { 220 /*
221 /* 221 * RT2880 and RT3052 don't support MCU requests.
222 * RT2880 and RT3052 don't support MCU requests. 222 */
223 */ 223 if (rt2x00_rt(&rt2x00dev->chip, RT2880) ||
224 if (rt2x00_rt(&rt2x00dev->chip, RT2880) || 224 rt2x00_rt(&rt2x00dev->chip, RT3052))
225 rt2x00_rt(&rt2x00dev->chip, RT3052)) 225 return;
226 return;
227 }
228 226
229 mutex_lock(&rt2x00dev->csr_mutex); 227 mutex_lock(&rt2x00dev->csr_mutex);
230 228
@@ -1482,8 +1480,7 @@ int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
1482 rt2800_bbp_write(rt2x00dev, 105, 0x05); 1480 rt2800_bbp_write(rt2x00dev, 105, 0x05);
1483 } 1481 }
1484 1482
1485 if (rt2x00_intf_is_pci(rt2x00dev) && 1483 if (rt2x00_rt(&rt2x00dev->chip, RT3052)) {
1486 rt2x00_rt(&rt2x00dev->chip, RT3052)) {
1487 rt2800_bbp_write(rt2x00dev, 31, 0x08); 1484 rt2800_bbp_write(rt2x00dev, 31, 0x08);
1488 rt2800_bbp_write(rt2x00dev, 78, 0x0e); 1485 rt2800_bbp_write(rt2x00dev, 78, 0x0e);
1489 rt2800_bbp_write(rt2x00dev, 80, 0x08); 1486 rt2800_bbp_write(rt2x00dev, 80, 0x08);