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

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

Issue 6851008: Fix for suspend/resume bug Base URL: http://git.chromium.org/git/kernel-next.git@chromeos-2.6.37
Patch Set: 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
Index: drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 375e378c0be7da88acec8232127f3bf455027c7b..4f300b7641554d6f6802f57b6ae529fe1609a559 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -1968,6 +1968,9 @@ static s32 wl_cfg80211_resume(struct wiphy *wiphy)
{
s32 err = 0;
+#if defined(CONFIG_PM_SLEEP)
+ dhd_mmc_suspend = false;
+#endif /* defined(CONFIG_PM_SLEEP) */
Olof Johansson 2011/04/14 18:13:43 If you move the variable out of ifdef, you can do
CHECK_SYS_UP();
wl_invoke_iscan(wiphy_to_wl(wiphy));
@@ -1993,7 +1996,10 @@ static s32 wl_cfg80211_suspend(struct wiphy *wiphy)
sdioh_sdio_set_host_pm_flags(MMC_PM_KEEP_POWER);
- return err;
+#if defined(CONFIG_PM_SLEEP)
+ dhd_mmc_suspend = true;
+#endif /* defined(CONFIG_PM_SLEEP) */
+ return err;
}
static __used s32
« drivers/staging/brcm80211/brcmfmac/dhd.h ('K') | « drivers/staging/brcm80211/brcmfmac/dhd_linux.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698