X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Fxen%2Fmanage.c;h=fddc2025dece777c513a7a7a72f8537751bf1834;hb=38f4b8c0da01ae7cd9b93386842ce272d6fde9ab;hp=0d61db1e7b49bc5f5fd095795e74001dadda1bc3;hpb=8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6;p=karo-tx-linux.git

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 0d61db1e7b49..fddc2025dece 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -62,14 +62,15 @@ static int xen_suspend(void *data)
 	gnttab_resume();
 	xen_mm_unpin_all();
 
-	sysdev_resume();
-
 	if (!*cancelled) {
 		xen_irq_resume();
 		xen_console_resume();
 		xen_timer_resume();
 	}
 
+	sysdev_resume();
+	device_power_up(PMSG_RESUME);
+
 	return 0;
 }
 
@@ -97,9 +98,8 @@ static void do_suspend(void)
 		goto out;
 	}
 
-	printk("suspending xenbus...\n");
-	/* XXX use normal device tree? */
-	xenbus_suspend();
+	printk(KERN_DEBUG "suspending xenstore...\n");
+	xs_suspend();
 
 	err = device_power_down(PMSG_SUSPEND);
 	if (err) {
@@ -115,9 +115,9 @@ static void do_suspend(void)
 
 	if (!cancelled) {
 		xen_arch_resume();
-		xenbus_resume();
+		xs_resume();
 	} else
-		xenbus_suspend_cancel();
+		xs_suspend_cancel();
 
 	device_power_up(PMSG_RESUME);