]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ath9k: Fix build error on ARM
authorSujith Manoharan <c_manoha@qca.qualcomm.com>
Tue, 4 Feb 2014 03:07:52 +0000 (08:37 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Feb 2014 20:30:07 +0000 (15:30 -0500)
Use mdelay instead of udelay to fix this error:

ERROR: "__bad_udelay" [drivers/net/wireless/ath/ath9k/ath9k_hw.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2

Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/hw.c

index fbf43c05713f476f9e6551ad2948dc1ff412970a..11eab9f01fd89ac9bb8f9b665646051a6386ac0a 100644 (file)
@@ -1316,7 +1316,7 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)
        if (AR_SREV_9300_20_OR_LATER(ah))
                udelay(50);
        else if (AR_SREV_9100(ah))
-               udelay(10000);
+               mdelay(10);
        else
                udelay(100);
 
@@ -2051,9 +2051,8 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah)
 
        REG_SET_BIT(ah, AR_RTC_FORCE_WAKE,
                    AR_RTC_FORCE_WAKE_EN);
-
        if (AR_SREV_9100(ah))
-               udelay(10000);
+               mdelay(10);
        else
                udelay(50);