aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/wl1271_sdio.c
diff options
context:
space:
mode:
authorTeemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>2010-03-18 12:26:46 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-03-23 16:50:25 -0400
commit3b56dd6a090e905eece023f690298013da4b6b67 (patch)
tree3cbb85dca62aa68ef14b134d813b77ec8919c4e4 /drivers/net/wireless/wl12xx/wl1271_sdio.c
parent2ea9fb3d79aac371e5bb0c4b0f5be7195e8fcd33 (diff)
wl1271: Changed platform_device to be dynamically allocated
Changed platform_device to be allocated dynamically from the wl1271_alloc_hw function. Also cleaned up error handling in the wl1271_alloc_hw function and module probe functions. Signed-off-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com> Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_sdio.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_sdio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c
index 99b5b3f7a92..3c03de74dbf 100644
--- a/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -239,7 +239,7 @@ static int __devinit wl1271_probe(struct sdio_func *func,
out_free:
- ieee80211_free_hw(hw);
+ wl1271_free_hw(wl);
return ret;
}
@@ -250,6 +250,7 @@ static void __devexit wl1271_remove(struct sdio_func *func)
free_irq(wl->irq, wl);
+ wl1271_unregister_hw(wl);
wl1271_free_hw(wl);
}