projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 27328a7)
ath9k: Handle failure to allocate HW timer
authorSujith Manoharan <c_manoha@qca.qualcomm.com>
Fri, 22 Aug 2014 15:09:25 +0000 (20:39 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 28 Aug 2014 18:41:57 +0000 (14:41 -0400)
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/init.c patch | blob | blame | history

diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 76771f37aa86efe816511940e15b10bb7c0917eb..4219e7bd4759d5e63566b639e0d5f29f87fb3355 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -601,7 +601,9 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
                goto err_btcoex;
 
        sc->p2p_ps_timer = ath_gen_timer_alloc(sc->sc_ah, ath9k_p2p_ps_timer,
-               NULL, sc, AR_FIRST_NDP_TIMER);
+                                              NULL, sc, AR_FIRST_NDP_TIMER);
+       if (!sc->p2p_ps_timer)
+               goto err_btcoex;
 
        ath9k_cmn_init_crypto(sc->sc_ah);
        ath9k_init_misc(sc);