Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / net / wireless / ath / ath9k / hw.c

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 7b485e4d104cdfb2f6dd584d2f97e0a2e229cf6e..07e25260c31d85084c8c680f69cda6ac85264e21 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -2983,13 +2983,8 @@ struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah,
        struct ath_gen_timer *timer;
 
        timer = kzalloc(sizeof(struct ath_gen_timer), GFP_KERNEL);
-
-       if (timer == NULL) {
-               ath_err(ath9k_hw_common(ah),
-                       "Failed to allocate memory for hw timer[%d]\n",
-                       timer_index);
+       if (timer == NULL)
                return NULL;
-       }
 
        /* allocate a hardware generic timer slot */
        timer_table->timers[timer_index] = timer;