diff options
Diffstat (limited to 'drivers/xen/manage.c')
-rw-r--r-- | drivers/xen/manage.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index fddc2025dece..d5b327ac4039 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c | |||
@@ -43,7 +43,7 @@ static int xen_suspend(void *data) | |||
43 | if (err) { | 43 | if (err) { |
44 | printk(KERN_ERR "xen_suspend: sysdev_suspend failed: %d\n", | 44 | printk(KERN_ERR "xen_suspend: sysdev_suspend failed: %d\n", |
45 | err); | 45 | err); |
46 | device_power_up(PMSG_RESUME); | 46 | device_resume_noirq(PMSG_RESUME); |
47 | return err; | 47 | return err; |
48 | } | 48 | } |
49 | 49 | ||
@@ -69,7 +69,7 @@ static int xen_suspend(void *data) | |||
69 | } | 69 | } |
70 | 70 | ||
71 | sysdev_resume(); | 71 | sysdev_resume(); |
72 | device_power_up(PMSG_RESUME); | 72 | device_resume_noirq(PMSG_RESUME); |
73 | 73 | ||
74 | return 0; | 74 | return 0; |
75 | } | 75 | } |
@@ -101,9 +101,9 @@ static void do_suspend(void) | |||
101 | printk(KERN_DEBUG "suspending xenstore...\n"); | 101 | printk(KERN_DEBUG "suspending xenstore...\n"); |
102 | xs_suspend(); | 102 | xs_suspend(); |
103 | 103 | ||
104 | err = device_power_down(PMSG_SUSPEND); | 104 | err = device_suspend_noirq(PMSG_SUSPEND); |
105 | if (err) { | 105 | if (err) { |
106 | printk(KERN_ERR "device_power_down failed: %d\n", err); | 106 | printk(KERN_ERR "device_suspend_noirq failed: %d\n", err); |
107 | goto resume_devices; | 107 | goto resume_devices; |
108 | } | 108 | } |
109 | 109 | ||
@@ -119,7 +119,7 @@ static void do_suspend(void) | |||
119 | } else | 119 | } else |
120 | xs_suspend_cancel(); | 120 | xs_suspend_cancel(); |
121 | 121 | ||
122 | device_power_up(PMSG_RESUME); | 122 | device_resume_noirq(PMSG_RESUME); |
123 | 123 | ||
124 | resume_devices: | 124 | resume_devices: |
125 | device_resume(PMSG_RESUME); | 125 | device_resume(PMSG_RESUME); |