Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[pandora-kernel.git] / drivers / base / power / domain.c

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 22fe029..6790cf7 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -714,7 +714,7 @@ static int pm_genpd_suspend_noirq(struct device *dev)
        if (ret)
                return ret;
 
-       if (device_may_wakeup(dev)
+       if (dev->power.wakeup_path
            && genpd->active_wakeup && genpd->active_wakeup(dev))
                return 0;
 
@@ -938,7 +938,7 @@ static int pm_genpd_dev_poweroff_noirq(struct device *dev)
        if (ret)
                return ret;
 
-       if (device_may_wakeup(dev)
+       if (dev->power.wakeup_path
            && genpd->active_wakeup && genpd->active_wakeup(dev))
                return 0;