From ec425bf5af07328c054a80478cf31bea675f912a Mon Sep 17 00:00:00 2001 From: Teemu Paasikivi Date: Mon, 22 Feb 2010 08:38:29 +0200 Subject: [PATCH] --- yaml --- r: 193661 b: refs/heads/master c: 49d7f6d8113a04abacdf99525db9c17d872c1efa h: refs/heads/master i: 193659: 2d960bb3c055e7b32e150dd99b9bea1721956ee1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9b1ac635b80b..45423b9b75ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09a9c2b3f464e757b6597f621cc3bedb6f040a27 +refs/heads/master: 49d7f6d8113a04abacdf99525db9c17d872c1efa diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c b/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c index be5c14935bc3..7d7c85041859 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_sdio.c +++ b/trunk/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);