Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Unified Diff: drivers/staging/brcm80211/brcmfmac/dhd_linux.c

Issue 6802002: drivers/staging/brcm80211: Fix for suspend/resume bug (Closed) Base URL: http://git.chromium.org/git/kernel-next.git@chromeos-2.6.37
Patch Set: Fixed review comments Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « drivers/staging/brcm80211/brcmfmac/dhd.h ('k') | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: drivers/staging/brcm80211/brcmfmac/dhd_linux.c
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 3efc17a0a4e01421f98ec2864b82e22ed47e5967..e40e2e97a7f22da44f74b4f4bcc354cda18fb71f 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -2088,7 +2088,10 @@ dhd_pub_t *dhd_attach(struct osl_info *osh, struct dhd_bus *bus,
g_bus = bus;
#endif
#if defined(CONFIG_PM_SLEEP)
- register_pm_notifier(&dhd_sleep_pm_notifier);
+ if (!IS_CFG80211_FAVORITE())
+ {
+ register_pm_notifier(&dhd_sleep_pm_notifier);
+ }
#endif /* defined(CONFIG_PM_SLEEP) */
/* && defined(DHD_GPL) */
/* Init lock suspend to prevent kernel going to suspend */
@@ -2394,7 +2397,10 @@ void dhd_detach(dhd_pub_t *dhdp)
wl_cfg80211_detach();
#if defined(CONFIG_PM_SLEEP)
- unregister_pm_notifier(&dhd_sleep_pm_notifier);
+ if (!IS_CFG80211_FAVORITE())
+ {
+ unregister_pm_notifier(&dhd_sleep_pm_notifier);
+ }
#endif /* defined(CONFIG_PM_SLEEP) */
/* && defined(DHD_GPL) */
free_netdev(ifp->net);
« no previous file with comments | « drivers/staging/brcm80211/brcmfmac/dhd.h ('k') | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698