From 9df337a104ab99c595cc4ede2c917ba1c2b66374 Mon Sep 17 00:00:00 2001 From: Vivek Natarajan Date: Thu, 15 Sep 2011 20:30:43 +0530 Subject: [PATCH] ath6kl: deinitialise wiphy on error This fixes the following panic observed on card removal. BUG: unable to handle kernel paging request at f86e22ac EIP is at wiphy_update_regulatory+0x252/0x590 [cfg80211] Call Trace: [] set_regdom+0x165/0x600 [cfg80211] [] ? __kmalloc+0x10a/0x190 [] ? nla_parse+0xb7/0xd0 [] ? T.1400+0x12/0x20 [cfg80211] [] nl80211_set_reg+0xe4/0x270 [cfg80211] [] ? nl80211_pre_doit+0x0/0x160 [cfg80211] [] genl_rcv_msg+0x23b/0x280 [] ? genl_rcv_msg+0x0/0x280 [] netlink_rcv_skb+0x86/0xb0 [] ? genl_rcv+0x0/0x30 [] genl_rcv+0x1c/0x30 Signed-off-by: Vivek Natarajan Signed-off-by: Kalle Valo --- drivers/net/wireless/ath/ath6kl/sdio.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c index 0cce80169670..4724ddfab4f7 100644 --- a/drivers/net/wireless/ath/ath6kl/sdio.c +++ b/drivers/net/wireless/ath/ath6kl/sdio.c @@ -25,6 +25,7 @@ #include "hif-ops.h" #include "target.h" #include "debug.h" +#include "cfg80211.h" struct ath6kl_sdio { struct sdio_func *func; @@ -816,7 +817,7 @@ static int ath6kl_sdio_probe(struct sdio_func *func, ath6kl_err("Failed to enable 4-bit async irq mode %d\n", ret); sdio_release_host(func); - goto err_dma; + goto err_cfg80211; } ath6kl_dbg(ATH6KL_DBG_TRC, "4-bit async irq mode enabled\n"); @@ -829,7 +830,7 @@ static int ath6kl_sdio_probe(struct sdio_func *func, ret = ath6kl_sdio_power_on(ar_sdio); if (ret) - goto err_dma; + goto err_cfg80211; sdio_claim_host(func); @@ -853,6 +854,8 @@ static int ath6kl_sdio_probe(struct sdio_func *func, err_off: ath6kl_sdio_power_off(ar_sdio); +err_cfg80211: + ath6kl_cfg80211_deinit(ar_sdio->ar); err_dma: kfree(ar_sdio->dma_buffer); err_hif: