diff options
| -rw-r--r-- | drivers/base/power/domain.c | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index d2c03239abcf..e79228c597f1 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -890,7 +890,8 @@ static int pm_genpd_resume_noirq(struct device *dev)  	if (IS_ERR(genpd))  		return -EINVAL; -	if (genpd->suspend_power_off) +	if (genpd->suspend_power_off +	    || (dev->power.wakeup_path && genpd_dev_active_wakeup(genpd, dev)))  		return 0;  	/* | 
