diff options
| author | Dave Airlie <airlied@redhat.com> | 2026-03-26 02:41:26 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2026-03-26 02:41:26 +0300 |
| commit | 13c072b8e91a5ccb5855ca1ba6fe3ea467dbf94d (patch) | |
| tree | 4f69505f13121244c22013245534caa2d1b04b52 /lib | |
| parent | 74919e2797727596816a06e55c35352e0707a710 (diff) | |
| parent | f338e77383789c0cae23ca3d48adcc5e9e137e3c (diff) | |
| download | linux-13c072b8e91a5ccb5855ca1ba6fe3ea467dbf94d.tar.xz | |
BackMerge tag 'v7.0-rc4' into drm-next
Linux 7.0-rc4
Needed for rust tree.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bootconfig.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bootconfig.c b/lib/bootconfig.c index 449369a60846..2da049216fe0 100644 --- a/lib/bootconfig.c +++ b/lib/bootconfig.c @@ -316,7 +316,7 @@ int __init xbc_node_compose_key_after(struct xbc_node *root, depth ? "." : ""); if (ret < 0) return ret; - if (ret > size) { + if (ret >= size) { size = 0; } else { size -= ret; @@ -532,9 +532,9 @@ static char *skip_spaces_until_newline(char *p) static int __init __xbc_open_brace(char *p) { /* Push the last key as open brace */ - open_brace[brace_index++] = xbc_node_index(last_parent); if (brace_index >= XBC_DEPTH_MAX) return xbc_parse_error("Exceed max depth of braces", p); + open_brace[brace_index++] = xbc_node_index(last_parent); return 0; } @@ -802,7 +802,7 @@ static int __init xbc_verify_tree(void) /* Brace closing */ if (brace_index) { - n = &xbc_nodes[open_brace[brace_index]]; + n = &xbc_nodes[open_brace[brace_index - 1]]; return xbc_parse_error("Brace is not closed", xbc_node_get_data(n)); } |