X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=drivers%2Fbase%2Fpower%2Fmain.c;h=c3d2dfcf438dd1735fcf401be9f8185440e9a1a9;hp=59f8ab23548689768a45baa6d68c11c97ca75b50;hb=3c512b193a3f8c24045b809db91b03f463f72105;hpb=6681ba7ec480bc839584fd0817991d248b4b9e44

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 59f8ab235486..c3d2dfcf438d 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -19,6 +19,7 @@
 
 #include <linux/device.h>
 #include <linux/kallsyms.h>
+#include <linux/export.h>
 #include <linux/mutex.h>
 #include <linux/pm.h>
 #include <linux/pm_runtime.h>
@@ -919,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;
 	}