Merge remote-tracking branch 'origin/master' into version/4.1

2023-10-31 21:27:39 +01:00
parent 1891e110c1 69a5fbd01e
commit 41f226c79f
39 changed files with 2457 additions and 2359 deletions
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -1657,7 +1657,7 @@ acpi_reset(void *priv)
    }

    /* Power on always generates a resume event. */
-    dev->regs.pmsts |= 0x8000;
+    dev->regs.pmsts |= 0x8100;

    acpi_rtc_status = 0;