Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / drivers / net / wireless / ath / ath9k / ar5008_phy.c

diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index 1b271b9..8eea8d2 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -260,8 +260,8 @@ void ar5008_hw_cmn_spur_mitigate(struct ath_hw *ah,
        int cur_bin;
        int upper, lower, cur_vit_mask;
        int i;
-       int8_t mask_m[123];
-       int8_t mask_p[123];
+       int8_t mask_m[123] = {0};
+       int8_t mask_p[123] = {0};
        int8_t mask_amt;
        int tmp_mask;
        static const int pilot_mask_reg[4] = {
@@ -274,9 +274,6 @@ void ar5008_hw_cmn_spur_mitigate(struct ath_hw *ah,
        };
        static const int inc[4] = { 0, 100, 0, 0 };
 
-       memset(&mask_m, 0, sizeof(int8_t) * 123);
-       memset(&mask_p, 0, sizeof(int8_t) * 123);
-
        cur_bin = -6000;
        upper = bin + 100;
        lower = bin - 100;
@@ -302,7 +299,7 @@ void ar5008_hw_cmn_spur_mitigate(struct ath_hw *ah,
        upper = bin + 120;
        lower = bin - 120;
 
-       for (i = 0; i < 123; i++) {
+       for (i = 0; i < ARRAY_SIZE(mask_m); i++) {
                if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) {
                        /* workaround for gcc bug #37014 */
                        volatile int tmp_v = abs(cur_vit_mask - bin);