]> Pileus Git - ~andy/linux/commitdiff
ath9k_hw: fix unreachable code in baseband hang detection code
authorFelix Fietkau <nbd@openwrt.org>
Sun, 9 Mar 2014 08:51:16 +0000 (09:51 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Mar 2014 18:57:26 +0000 (14:57 -0400)
The commit "ath9k: reduce baseband hang detection false positive rate"
added a delay in the loop checking the baseband state, however it was
unreachable due to previous 'continue' statements.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/hw.c

index 303ce27964c14c3469d245632c6f5739289520b0..9078a6c5a74e3b340266836f7c0151b242ccbc1e 100644 (file)
@@ -1548,6 +1548,7 @@ bool ath9k_hw_check_alive(struct ath_hw *ah)
                if (reg != last_val)
                        return true;
 
+               udelay(1);
                last_val = reg;
                if ((reg & 0x7E7FFFEF) == 0x00702400)
                        continue;
@@ -1560,8 +1561,6 @@ bool ath9k_hw_check_alive(struct ath_hw *ah)
                default:
                        return true;
                }
-
-               udelay(1);
        } while (count-- > 0);
 
        return false;