diff options
| author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-08-13 04:46:48 +0200 |
|---|---|---|
| committer | Luciano Coelho <luciano.coelho@nokia.com> | 2010-09-28 12:15:09 +0300 |
| commit | 4e23b11b08ed116664cce6114546d5a96eb94e8b (patch) | |
| tree | 7aeba7d1947af2eaa89e4d5cdf7a50863e027dfb | |
| parent | 165530974504e21d79a43e5f964bd9284e45a8f1 (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.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_spi.c | 3 |
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 f2f04663627c..4c250d7dc3fa 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) { struct wl1271 *wl = sdio_get_drvdata(func); - free_irq(wl->irq, wl); - wl1271_unregister_hw(wl); + free_irq(wl->irq, wl); wl1271_free_hw(wl); } diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c b/drivers/net/wireless/wl12xx/wl1271_spi.c index ced0a9e2c7e1..75cbf36146e2 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) { struct wl1271 *wl = dev_get_drvdata(&spi->dev); - free_irq(wl->irq, wl); - wl1271_unregister_hw(wl); + free_irq(wl->irq, wl); wl1271_free_hw(wl); return 0; |