diff options
Diffstat (limited to 'drivers/base/power/main.c')
| -rw-r--r-- | drivers/base/power/main.c | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 7fa098464da..c3d2dfcf438 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -920,7 +920,8 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)   End:  	if (!error) {  		dev->power.is_suspended = true; -		if (dev->power.wakeup_path && dev->parent) +		if (dev->power.wakeup_path +		    && dev->parent && !dev->parent->power.ignore_children)  			dev->parent->power.wakeup_path = true;  	}  |