Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 42734
b: refs/heads/master
c: 5045cfc
h: refs/heads/master
v: v3
  • Loading branch information
Pavel Machek authored and Linus Torvalds committed Dec 7, 2006
1 parent a360cbe commit 91f205f
Show file tree
Hide file tree
Showing 2 changed files with 2 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: 2d87595ea628ea58415ba4638c553a8c2fbd90e2
refs/heads/master: 5045cfc103566878228ca36d05a0ae0076673e5a
4 changes: 1 addition & 3 deletions trunk/kernel/power/disk.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,10 @@ static inline int platform_prepare(void)

static void power_down(suspend_disk_method_t mode)
{
int error = 0;

switch(mode) {
case PM_DISK_PLATFORM:
kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
error = pm_ops->enter(PM_SUSPEND_DISK);
pm_ops->enter(PM_SUSPEND_DISK);
break;
case PM_DISK_SHUTDOWN:
kernel_power_off();
Expand Down

0 comments on commit 91f205f

Please sign in to comment.