You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Pull bugfix into test branch
Conflicts: kernel/power/disk.c
This commit is contained in:
+5
-3
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user