diff options
| author | Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com> | 2010-03-18 12:26:46 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-03-23 16:50:25 -0400 |
| commit | 3b56dd6a090e905eece023f690298013da4b6b67 (patch) | |
| tree | 3cbb85dca62aa68ef14b134d813b77ec8919c4e4 /drivers/net/wireless/wl12xx/wl1271_spi.c | |
| parent | 2ea9fb3d79aac371e5bb0c4b0f5be7195e8fcd33 (diff) | |
| download | lwn-3b56dd6a090e905eece023f690298013da4b6b67.tar.gz lwn-3b56dd6a090e905eece023f690298013da4b6b67.zip | |
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_spi.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_spi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c b/drivers/net/wireless/wl12xx/wl1271_spi.c index 4c129c76c29d..f44b05a32b0d 100644 --- a/drivers/net/wireless/wl12xx/wl1271_spi.c +++ b/drivers/net/wireless/wl12xx/wl1271_spi.c @@ -422,7 +422,7 @@ static int __devinit wl1271_probe(struct spi_device *spi) free_irq(wl->irq, wl); out_free: - ieee80211_free_hw(hw); + wl1271_free_hw(wl); return ret; } @@ -433,6 +433,7 @@ static int __devexit wl1271_remove(struct spi_device *spi) free_irq(wl->irq, wl); + wl1271_unregister_hw(wl); wl1271_free_hw(wl); return 0; |