aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/orinoco/main.c
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2015-08-06 12:46:31 -0400
committerKalle Valo <kvalo@codeaurora.org>2015-08-13 15:36:47 +0300
commit94fdc2e627d1b479a117cd8b9ece5f4613a5c956 (patch)
tree125033af6b6efbc00aa7c8c8b59a7479586d2416 /drivers/net/wireless/orinoco/main.c
parentmwifiex: claim sdio bus while downloading the firmware (diff)
downloadlinux-dev-94fdc2e627d1b479a117cd8b9ece5f4613a5c956.tar.xz
linux-dev-94fdc2e627d1b479a117cd8b9ece5f4613a5c956.zip
orinoco: Do not call wiphy_unregister() from free_orinocodev()
alloc_orinocodev() would allocate the wiphy entry, but it would only get registered much later in orinoco_init(). If something failed in the init process inbetween the call to alloc_orinocodev() and the completion of orinoco_init(), the drivers would end up calling wiphy_unregister() with a NULL pointer causing beautiful OOPS fireworks. Explicitly call wiphy_unregister() instead in the right places. Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/orinoco/main.c')
-rw-r--r--drivers/net/wireless/orinoco/main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index c410180479e6..7b5c554323c7 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -2321,8 +2321,6 @@ void free_orinocodev(struct orinoco_private *priv)
struct orinoco_rx_data *rx_data, *temp;
struct orinoco_scan_data *sd, *sdtemp;
- wiphy_unregister(wiphy);
-
/* If the tasklet is scheduled when we call tasklet_kill it
* will run one final time. However the tasklet will only
* drain priv->rx_list if the hw is still available. */