diff options
| author | Rasmus Villemoes <[email protected]> | 2024-10-03 23:27:54 +0200 |
|---|---|---|
| committer | Stefan Roese <[email protected]> | 2024-10-23 06:52:38 +0200 |
| commit | 92957de3621ecc77f2bd1883a8fc33b8e598d964 (patch) | |
| tree | a0f919cd0c99d5fda35ea1c72a5995508c6a0f4e | |
| parent | b279aa505de7e22762e00c7f360da7b84fa8ab59 (diff) | |
fs/cramfs: use schedule instead of cyclic_run as callback
Prior to commit 29caf9305b6f ("cyclic: Use schedule() instead of
WATCHDOG_RESET()") we had
/* Currently only needed for fs/cramfs/uncompress.c */
static inline void watchdog_reset_func(void)
{
WATCHDOG_RESET();
}
and .outcb was set to that watchdog_reset_func(). Said commit changed
that .outcb to cyclic_run instead of schedule, which would otherwise
match all the other WATCHDOG_RESET replacements done. As the
HW_WATCHDOG case is not handled by cyclic_run, this seems to be an
oversight.
Signed-off-by: Rasmus Villemoes <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
Reviewed-by: Stefan Roese <[email protected]>
| -rw-r--r-- | fs/cramfs/uncompress.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cramfs/uncompress.c b/fs/cramfs/uncompress.c index 2141edf22e4..97af8cb2b4f 100644 --- a/fs/cramfs/uncompress.c +++ b/fs/cramfs/uncompress.c @@ -21,9 +21,9 @@ */ #include <stdio.h> -#include <cyclic.h> #include <malloc.h> #include <watchdog.h> +#include <u-boot/schedule.h> #include <u-boot/zlib.h> static z_stream stream; @@ -63,7 +63,7 @@ int cramfs_uncompress_init (void) stream.avail_in = 0; #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) - stream.outcb = (cb_func)cyclic_run; + stream.outcb = (cb_func)schedule; #else stream.outcb = Z_NULL; #endif /* CONFIG_HW_WATCHDOG */ |