diff options
| author | Tom Rini <[email protected]> | 2023-08-08 21:38:05 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-08-08 21:38:05 -0400 |
| commit | 1e1437d9f8b5be362afdd0212dbae6c41f53f3d8 (patch) | |
| tree | 7c22536424032112c0c5e3ddce45f0333478f355 /boot | |
| parent | a169438411f9277cc689c14078151aa1d1caae3c (diff) | |
| parent | 70fdcc704a978acb4de5e891469825596c0d292e (diff) | |
Merge branch '2023-08-08-assorted-code-corrections' into next
- A number of code corrections caught by Smatch and a few others as
well.
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/android_ab.c | 1 | ||||
| -rw-r--r-- | boot/pxe_utils.c | 4 | ||||
| -rw-r--r-- | boot/scene_menu.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/boot/android_ab.c b/boot/android_ab.c index 73b55c196c4..0f20a34e511 100644 --- a/boot/android_ab.c +++ b/boot/android_ab.c @@ -12,7 +12,6 @@ #include <memalign.h> #include <linux/err.h> #include <u-boot/crc.h> -#include <u-boot/crc.h> /** * Compute the CRC-32 of the bootloader control struct. diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index d13c47dd942..ac1414a5f26 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -702,8 +702,8 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) } } - if (label->kaslrseed) - label_boot_kaslrseed(); + if (label->kaslrseed) + label_boot_kaslrseed(); #ifdef CONFIG_OF_LIBFDT_OVERLAY if (label->fdtoverlays) diff --git a/boot/scene_menu.c b/boot/scene_menu.c index 8a355f838cc..57ffb523ff3 100644 --- a/boot/scene_menu.c +++ b/boot/scene_menu.c @@ -416,7 +416,7 @@ int scene_menuitem(struct scene *scn, uint menu_id, const char *name, uint id, if (!scene_obj_find(scn, label_id, SCENEOBJT_TEXT)) return log_msg_ret("txt", -EINVAL); - item = calloc(1, sizeof(struct scene_obj_menu)); + item = calloc(1, sizeof(struct scene_menitem)); if (!item) return log_msg_ret("item", -ENOMEM); item->name = strdup(name); |