Home Home > GIT Browse > stable-xen
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2017-09-07 09:38:36 -0400
committerJeff Mahoney <jeffm@suse.com>2017-09-07 09:38:36 -0400
commitf4a533525b260ae50e8410361a0d35631985cfd6 (patch)
tree5adb58553914495c02631f2d091d63e56fecb107
parentf3adc13a7d7d3c6956806ca45de746059274643e (diff)
parentf9aea017e09e9c69ba9eeb507af99adbe3af458e (diff)
Merge commit 'f9aea017e09e9c69ba9eeb507af99adbe3af458e' of git://kerncvs.suse.de/kernel-source
-rw-r--r--drivers/net/wireless/ralink/rt2x00/rt2800lib.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index 0b75def39c6c..d2c289446c00 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -3702,7 +3702,10 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
if (rt2x00_rt(rt2x00dev, RT3572))
rt2800_rfcsr_write(rt2x00dev, 8, 0);
- tx_pin = rt2800_register_read(rt2x00dev, TX_PIN_CFG);
+ if (rt2x00_rt(rt2x00dev, RT6352))
+ tx_pin = rt2800_register_read(rt2x00dev, TX_PIN_CFG);
+ else
+ tx_pin = 0;
switch (rt2x00dev->default_ant.tx_chain_num) {
case 3: