From: Ming Jiang Date: Wed, 18 Apr 2012 01:25:04 +0000 (+0800) Subject: ath6kl clear the MMC_PM_KEEP_POWER for cutpower case X-Git-Tag: v3.5-rc1~101^2~6^2^2~84^2~16 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5699257f69f9584d10b53bb595ed58a434d64321;p=karo-tx-linux.git ath6kl clear the MMC_PM_KEEP_POWER for cutpower case ath6kl: If wow deepsleep pno suspend failure driver will choose cutpower. in this scenario MMC_PM_KEEP_POWER should be cleared so that mmc will power off the ar6000 kvalo: remove extra parenthesis Signed-off-by: Ming Jiang Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c index cfcc3216db15..0384a0fb654f 100644 --- a/drivers/net/wireless/ath/ath6kl/sdio.c +++ b/drivers/net/wireless/ath/ath6kl/sdio.c @@ -915,6 +915,9 @@ static int ath6kl_sdio_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow) } cut_pwr: + if (func->card && func->card->host) + func->card->host->pm_flags &= ~MMC_PM_KEEP_POWER; + return ath6kl_cfg80211_suspend(ar, ATH6KL_CFG_SUSPEND_CUTPOWER, NULL); }