diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-08-20 16:34:58 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2012-08-31 18:06:51 -0700 |
| commit | a31910a8af80ddb701d8ca53e66add1e8bcffde6 (patch) | |
| tree | d3c0a9fcce0b5e708e2537ba8d1f226fc34c578f | |
| parent | 895923281247bf9acb68e9c7546387f8bea25ce7 (diff) | |
wl12xx_sdio: reset during op_remove_interface
| -rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/wl12xx/sdio.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 81e31344640f..f1ffec0b3bb6 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -1767,6 +1767,8 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw, mutex_unlock(&wl->mutex); cancel_work_sync(&wl->recovery_work); + if (wl->set_power) + wl->set_power(0); } void wl1271_configure_filters(struct wl1271 *wl, unsigned int filters) diff --git a/drivers/net/wireless/wl12xx/sdio.c b/drivers/net/wireless/wl12xx/sdio.c index 536e5065454b..5bd82f2c15ca 100644 --- a/drivers/net/wireless/wl12xx/sdio.c +++ b/drivers/net/wireless/wl12xx/sdio.c @@ -303,6 +303,7 @@ static int __devinit wl1271_probe(struct sdio_func *func, /* Tell PM core that we don't need the card to be powered now */ pm_runtime_put_noidle(&func->dev); + wl->set_power = wlan_data->set_power; wl1271_notice("initialized"); return 0; |