aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJisheng Zhang <jszhang@marvell.com>2015-06-02 06:38:35 -0400
committerUlf Hansson <ulf.hansson@linaro.org>2015-06-04 04:03:52 -0400
commit83dc9fecd5d4c84e9405c91098ae9dc07c201b90 (patch)
tree8730f55f3944fdca3f094fc8454fcd3992f233bf
parent1ef48e3ded7d25a6c382c4c74f44474e76038275 (diff)
mmc: sdhci-pxav3: fix device wakeup initialization
MMC_PM_KEEP_POWER doesn't imply MMC_PM_WAKE_SDIO_IRQ, we should only enable device wake up when MMC_PM_WAKE_SDIO_IRQ is set. And "pm_flags" is the requested pm features, we should not set it in the host driver. At the same time, device wakeup is disabled by default, so there's no need to disable device wakeup explicitly. This patch fixes the warning as following: [ 64.616651] ------------[ cut here ]------------ [ 64.616665] WARNING: CPU: 0 PID: 79 at linux/kernel/irq/manage.c:603 irq_set_irq_wake+0xf0/0x11c() [ 64.616667] Unbalanced IRQ 87 wake disable Signed-off-by: Jisheng Zhang <jszhang@marvell.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/sdhci-pxav3.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index 01cb2d309a6a..9cd5fc62f130 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -457,12 +457,8 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
457 457
458 platform_set_drvdata(pdev, host); 458 platform_set_drvdata(pdev, host);
459 459
460 if (host->mmc->pm_caps & MMC_PM_KEEP_POWER) { 460 if (host->mmc->pm_caps & MMC_PM_WAKE_SDIO_IRQ)
461 device_init_wakeup(&pdev->dev, 1); 461 device_init_wakeup(&pdev->dev, 1);
462 host->mmc->pm_flags |= MMC_PM_WAKE_SDIO_IRQ;
463 } else {
464 device_init_wakeup(&pdev->dev, 0);
465 }
466 462
467 pm_runtime_put_autosuspend(&pdev->dev); 463 pm_runtime_put_autosuspend(&pdev->dev);
468 464