diff options
| author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2014-08-22 20:39:25 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-08-28 14:41:57 -0400 |
| commit | 4f6816913f5e0bc4c983674a14a08c6e3729b449 (patch) | |
| tree | cee3c5c4a79909e8df0ca4424d1a87e3a7ecbe19 /drivers/net/wireless/ath/ath9k/init.c | |
| parent | 27328a75daa92035265a74199ff4fb919739357a (diff) | |
| download | lwn-4f6816913f5e0bc4c983674a14a08c6e3729b449.tar.gz lwn-4f6816913f5e0bc4c983674a14a08c6e3729b449.zip | |
ath9k: Handle failure to allocate HW timer
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 76771f37aa86..4219e7bd4759 100644 --- 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); |