aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>2010-08-12 22:46:48 -0400
committerLuciano Coelho <luciano.coelho@nokia.com>2010-09-28 05:15:09 -0400
commit4e23b11b08ed116664cce6114546d5a96eb94e8b (patch)
tree7aeba7d1947af2eaa89e4d5cdf7a50863e027dfb
parent165530974504e21d79a43e5f964bd9284e45a8f1 (diff)
wl1271: Release interrupt *after* releasing the driver context
The current order causes driver releasing to fail in various ways, and causes possible instability. Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_sdio.c3
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_spi.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c
index f2f04663627..4c250d7dc3f 100644
--- a/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -274,9 +274,8 @@ static void __devexit wl1271_remove(struct sdio_func *func)
274{ 274{
275 struct wl1271 *wl = sdio_get_drvdata(func); 275 struct wl1271 *wl = sdio_get_drvdata(func);
276 276
277 free_irq(wl->irq, wl);
278
279 wl1271_unregister_hw(wl); 277 wl1271_unregister_hw(wl);
278 free_irq(wl->irq, wl);
280 wl1271_free_hw(wl); 279 wl1271_free_hw(wl);
281} 280}
282 281
diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c b/drivers/net/wireless/wl12xx/wl1271_spi.c
index ced0a9e2c7e..75cbf36146e 100644
--- a/drivers/net/wireless/wl12xx/wl1271_spi.c
+++ b/drivers/net/wireless/wl12xx/wl1271_spi.c
@@ -416,9 +416,8 @@ static int __devexit wl1271_remove(struct spi_device *spi)
416{ 416{
417 struct wl1271 *wl = dev_get_drvdata(&spi->dev); 417 struct wl1271 *wl = dev_get_drvdata(&spi->dev);
418 418
419 free_irq(wl->irq, wl);
420
421 wl1271_unregister_hw(wl); 419 wl1271_unregister_hw(wl);
420 free_irq(wl->irq, wl);
422 wl1271_free_hw(wl); 421 wl1271_free_hw(wl);
423 422
424 return 0; 423 return 0;