Home Home > GIT Browse > stable-xen
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-08-31 17:43:44 +0200
committerJiri Slaby <jslaby@suse.cz>2017-09-07 13:19:07 +0200
commitf9aea017e09e9c69ba9eeb507af99adbe3af458e (patch)
tree23942b28fc29ff363b779fee36517d875bdc1404
parentdf947c42a90af6184d76216d6a05809f84a5355e (diff)
rt2800: fix TX_PIN_CFG setting for non MT7620 chips
(bsc#1055826). suse-commit: 8116757e42d582c68cf3e6d41c26f4ec456b2851
-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: