diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-28 09:56:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-28 09:56:05 -0400 |
| commit | 94e836f7ddab44f5e62e69a2f9fa97e975fd1b90 (patch) | |
| tree | d3d5947e5c1e76e0295e1c6e854ae9b35aaeac71 /arch/arm/mach-apple/rtkit.c | |
| parent | c259b197f6f8a4b1d33700e0b9202781fb8ce737 (diff) | |
| parent | ed48490f8d3f8715b23071a8a1cbe5bba8c8626e (diff) | |
Merge branch '2022-03-28-critical-fixes'
- A zstd, two Apple M1 and an MXS NAND critical bugfix
- Clean up another file that wasn't being removed and update some
external documentation links.
Diffstat (limited to 'arch/arm/mach-apple/rtkit.c')
| -rw-r--r-- | arch/arm/mach-apple/rtkit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-apple/rtkit.c b/arch/arm/mach-apple/rtkit.c index dff475cab7d..2dcb8bdd3e4 100644 --- a/arch/arm/mach-apple/rtkit.c +++ b/arch/arm/mach-apple/rtkit.c @@ -170,7 +170,7 @@ wait_epmap: pwrstate = APPLE_RTKIT_PWR_STATE_SLEEP; while (pwrstate != APPLE_RTKIT_PWR_STATE_ON) { - ret = mbox_recv(chan, &msg, 100000); + ret = mbox_recv(chan, &msg, 1000000); if (ret < 0) return ret; |