---

yaml --- r: 359893 b: refs/heads/master c: 9ddc4f2 h: refs/heads/master i: 359891: 36dc9ad v: v3
git-mirror · Jan 28, 2013 · 64d2901 · 64d2901
1 parent b731097
commit 64d2901
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8678b8181dacb1804325f70e63a176873ce9784f
+refs/heads/master: 9ddc4f27cf9ebb413c713fb4419c4f5e80c6a5f3
diff --git a/trunk/drivers/mmc/host/sdhci-pxav3.c b/trunk/drivers/mmc/host/sdhci-pxav3.c
@@ -311,6 +311,13 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, host);
 
+	if (pdata->pm_caps & MMC_PM_KEEP_POWER) {
+		device_init_wakeup(&pdev->dev, 1);
+		host->mmc->pm_flags |= MMC_PM_WAKE_SDIO_IRQ;
+	} else {
+		device_init_wakeup(&pdev->dev, 0);
+	}
+
 	return 0;
 
 err_add_host: