]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
rt2x00: Fix MCU_SLEEP arguments
authorIvo van Doorn <ivdoorn@gmail.com>
Thu, 4 Nov 2010 19:40:46 +0000 (20:40 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 15 Nov 2010 18:26:06 +0000 (13:26 -0500)
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>
drivers/net/wireless/rt2x00/rt2800pci.c
drivers/net/wireless/rt2x00/rt2800usb.c

index 6dc61b7710b9d494da3dcb1ef021e02ed41399e3..1db0c3bf2e1f76c5dbbab0a08f9b651a05ef869f 100644 (file)
@@ -442,7 +442,7 @@ static int rt2800pci_set_state(struct rt2x00_dev *rt2x00dev,
         * if the device is booting and wasn't asleep it will return
         * failure when attempting to wakeup.
         */
-       rt2800_mcu_request(rt2x00dev, MCU_SLEEP, 0xff, 0, 2);
+       rt2800_mcu_request(rt2x00dev, MCU_SLEEP, 0xff, 0xff, 2);
 
        if (state == STATE_AWAKE) {
                rt2800_mcu_request(rt2x00dev, MCU_WAKEUP, TOKEN_WAKUP, 0, 0);
index 04dfedc70f85be0c449e82406682e2eb2d72c6f8..5c31e3350aace420197461526f67fece4e2162ff 100644 (file)
@@ -184,9 +184,9 @@ static int rt2800usb_set_state(struct rt2x00_dev *rt2x00dev,
                               enum dev_state state)
 {
        if (state == STATE_AWAKE)
-               rt2800_mcu_request(rt2x00dev, MCU_WAKEUP, 0xff, 0, 0);
+               rt2800_mcu_request(rt2x00dev, MCU_WAKEUP, 0xff, 0, 2);
        else
-               rt2800_mcu_request(rt2x00dev, MCU_SLEEP, 0xff, 0, 2);
+               rt2800_mcu_request(rt2x00dev, MCU_SLEEP, 0xff, 0xff, 2);
 
        return 0;
 }