diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-06-30 10:09:06 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:38:46 -0800 |
| commit | 3460f5421e91988358b77422a06f98d63ffcc509 (patch) | |
| tree | 664aa75714a86863298ad63d818fae5da4d50b0d | |
| parent | 86b2a85684e57da38c6d0c85d4b1aed5a41f8641 (diff) | |
net: wireless: bcmdhd: Fix pm_notifier unregistration
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_linux.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c index 46e4a81b490c..dee662c86d81 100644 --- a/drivers/net/wireless/bcmdhd/dhd_linux.c +++ b/drivers/net/wireless/bcmdhd/dhd_linux.c @@ -3037,7 +3037,6 @@ void dhd_detach(dhd_pub_t *dhdp) } #endif /* defined(CONFIG_HAS_EARLYSUSPEND) */ - #if defined(CONFIG_WIRELESS_EXT) if (dhd->dhd_state & DHD_ATTACH_STATE_WL_ATTACH) { /* Detatch and unlink in the iw */ @@ -3108,12 +3107,11 @@ void dhd_detach(dhd_pub_t *dhdp) wl_cfg80211_detach(); #endif - if (dhd->dhd_state & DHD_ATTACH_STATE_WAKELOCKS_INIT) { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)) && defined(CONFIG_PM_SLEEP) - unregister_pm_notifier(&dhd_sleep_pm_notifier); -#endif - /* && defined(CONFIG_PM_SLEEP) */ + unregister_pm_notifier(&dhd_sleep_pm_notifier); +#endif + if (dhd->dhd_state & DHD_ATTACH_STATE_WAKELOCKS_INIT) { #ifdef CONFIG_HAS_WAKELOCK wake_lock_destroy(&dhd->wl_wifi); wake_lock_destroy(&dhd->wl_rxwake); |