diff --git a/[refs] b/[refs] index 4688a6ddb10f..76e33c04261c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3b8ea7554862e80a14b83233b37ddd2506d1d70 +refs/heads/master: 801a673ed1b36fc0e7dd92d8bb0090a4dc26a7d0 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c b/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c index 0478919138d4..99b5b3f7a92c 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c @@ -248,20 +248,9 @@ static void __devexit wl1271_remove(struct sdio_func *func) { struct wl1271 *wl = sdio_get_drvdata(func); - ieee80211_unregister_hw(wl->hw); - free_irq(wl->irq, wl); - kfree(wl->target_mem_map); - vfree(wl->fw); - wl->fw = NULL; - kfree(wl->nvs); - wl->nvs = NULL; - - kfree(wl->fw_status); - kfree(wl->tx_res_if); - - ieee80211_free_hw(wl->hw); + wl1271_free_hw(wl); } static struct sdio_driver wl1271_sdio_driver = {