Pull bugfix into test branch

Conflicts:

	kernel/power/disk.c
This commit is contained in:
Len Brown
2006-12-16 01:01:18 -05:00
3 changed files with 14 additions and 12 deletions
+5 -3
View File
@@ -60,9 +60,11 @@ static void power_down(suspend_disk_method_t mode)
{
switch(mode) {
case PM_DISK_PLATFORM:
kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
pm_ops->enter(PM_SUSPEND_DISK);
break;
if (pm_ops && pm_ops->enter) {
kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
pm_ops->enter(PM_SUSPEND_DISK);
break;
}
case PM_DISK_SHUTDOWN:
kernel_power_off();
break;