diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/wl1271_sdio.c
index be5c14935bc39d616e25826b2639ef12a26df2f3..7d7c8504185927181bd6c32b7596d1c406340e8b 100644
--- a/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c
@@ -219,6 +219,8 @@ static int __devinit wl1271_probe(struct sdio_func *func,
 		goto out_irq;
 
 	sdio_claim_host(func);
+	sdio_set_drvdata(func, wl);
+
 	ret = sdio_enable_func(func);
 	if (ret)
 		goto out_release;
@@ -246,10 +248,11 @@ static void __devexit wl1271_remove(struct sdio_func *func)
 {
 	struct wl1271 *wl = sdio_get_drvdata(func);
 
+	ieee80211_unregister_hw(wl->hw);
+
 	sdio_claim_host(func);
 	sdio_disable_func(func);
 	sdio_release_host(func);
-	ieee80211_unregister_hw(wl->hw);
 
 	free_irq(wl->irq, wl);