From bcc458fc7fa04599ea4a386367b0a0be3fce0554 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Thu, 30 Jun 2011 10:09:06 -0700 Subject: [PATCH 343/696] net: wireless: bcmdhd: Fix pm_notifier unregistration Signed-off-by: Dmitry Shmidt --- 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 46e4a81..dee662c 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); -- 1.7.1