Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 143245
b: refs/heads/master
c: 9a5a2ca
h: refs/heads/master
i:
  143243: 29fd308
v: v3
  • Loading branch information
Ian Campbell authored and Jeremy Fitzhardinge committed Apr 8, 2009
1 parent d2c8d03 commit de2d9a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 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: e3f8a74e3a884b91a4390c66ed8175ef74db7067
refs/heads/master: 9a5a2cac9f99c98d9d15cec17b1904f29d0e8009
5 changes: 3 additions & 2 deletions trunk/drivers/xen/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit de2d9a5

Please sign in to comment.