Merge branch 'master' into halfandquarter

[carl9170fw.git] / carlfw / usb / main.c

diff --git a/carlfw/usb/main.c b/carlfw/usb/main.c
index 890970c24ab237a7cd596eb8eb1903ecc04cc7e1..106eeb72137355f75e04175e86fb0deeda1f563f 100644 (file)
--- a/carlfw/usb/main.c
+++ b/carlfw/usb/main.c
@@ -246,7 +246,7 @@ static void turn_power_off(void)
                                  AR9170_PWR_RESET_WLAN_MASK);
        set(AR9170_PWR_REG_RESET, 0x0);
 
-       clock_set(AHB_20_22MHZ, false);
+       clock_set(AHB_20_22MHZ, false, 0);
 
        set(AR9170_PWR_REG_PLL_ADDAC, 0x5163);  /* 0x502b; */
        set(AR9170_PHY_REG_ADC_SERIAL_CTL, AR9170_PHY_ADC_SCTL_SEL_EXTERNAL_RADIO);
@@ -377,6 +377,7 @@ static void usb_handler(uint8_t usb_interrupt_level1)
 
                if (usb_interrupt_level2 & AR9170_USB_INTR_SRC7_USB_RESET) {
                        usb_reset_ack();
+                       usb_reset_eps();
                        reboot();
                }