aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2010-11-04 15:40:46 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-11-15 13:26:06 -0500
commit303c7d6abfd0430e39e84a43361492b4a8c890b6 (patch)
tree69350aedfe1dd148efbc59c28a2d5530cf9b576d
parentf44df18c58d4debe3ec0bb76a490aa2f3929fd8b (diff)
rt2x00: Fix MCU_SLEEP arguments
Legacy driver uses 0xff as the second argument for the MCU_SLEEP command. It is still unknown what the values actually mean, but this will at least keep the command in-sync with the original driver. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt2800pci.c2
-rw-r--r--drivers/net/wireless/rt2x00/rt2800usb.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 6dc61b7710b9..1db0c3bf2e1f 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -442,7 +442,7 @@ static int rt2800pci_set_state(struct rt2x00_dev *rt2x00dev,
442 * if the device is booting and wasn't asleep it will return 442 * if the device is booting and wasn't asleep it will return
443 * failure when attempting to wakeup. 443 * failure when attempting to wakeup.
444 */ 444 */
445 rt2800_mcu_request(rt2x00dev, MCU_SLEEP, 0xff, 0, 2); 445 rt2800_mcu_request(rt2x00dev, MCU_SLEEP, 0xff, 0xff, 2);
446 446
447 if (state == STATE_AWAKE) { 447 if (state == STATE_AWAKE) {
448 rt2800_mcu_request(rt2x00dev, MCU_WAKEUP, TOKEN_WAKUP, 0, 0); 448 rt2800_mcu_request(rt2x00dev, MCU_WAKEUP, TOKEN_WAKUP, 0, 0);
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 04dfedc70f85..5c31e3350aac 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -184,9 +184,9 @@ static int rt2800usb_set_state(struct rt2x00_dev *rt2x00dev,
184 enum dev_state state) 184 enum dev_state state)
185{ 185{
186 if (state == STATE_AWAKE) 186 if (state == STATE_AWAKE)
187 rt2800_mcu_request(rt2x00dev, MCU_WAKEUP, 0xff, 0, 0); 187 rt2800_mcu_request(rt2x00dev, MCU_WAKEUP, 0xff, 0, 2);
188 else 188 else
189 rt2800_mcu_request(rt2x00dev, MCU_SLEEP, 0xff, 0, 2); 189 rt2800_mcu_request(rt2x00dev, MCU_SLEEP, 0xff, 0xff, 2);
190 190
191 return 0; 191 return 0;
192} 192}