diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-05 13:50:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-05 13:50:27 -0400 |
| commit | 46bf695802bb090d9d0d0fec6bb5b46c24b17d4e (patch) | |
| tree | 788afdbec413608f6331ffbac4153f0f6736e6b7 /drivers/net/wireless/wl12xx/wl1271_sdio.c | |
| parent | e7480bbb926c5816e4fbfca70748096bbe0e4978 (diff) | |
| parent | 4b48e6876b641e1138f37a0fc11fb6a4fc3e24e1 (diff) | |
Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_sdio.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_sdio.c | 3 |
1 files changed, 1 insertions, 2 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); } |