Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 145830
b: refs/heads/master
c: 1e6fcf8
h: refs/heads/master
v: v3
  • Loading branch information
Ian Campbell authored and Jeremy Fitzhardinge committed Mar 30, 2009
1 parent 832b6c0 commit f06bdb6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8de07bbdede03598801cf33ab23dcbcd28a918d2
refs/heads/master: 1e6fcf840e11ceff8a656a678c6e4b0560a98e08
6 changes: 3 additions & 3 deletions trunk/drivers/xen/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ static int xen_suspend(void *data)
gnttab_resume();
xen_mm_unpin_all();

sysdev_resume();
device_power_up(PMSG_RESUME);

if (!*cancelled) {
xen_irq_resume();
xen_console_resume();
xen_timer_resume();
}

sysdev_resume();
device_power_up(PMSG_RESUME);

return 0;
}

Expand Down

0 comments on commit f06bdb6

Please sign in to comment.