diff options
| -rw-r--r-- | firmware/2lib/2misc.c | 2 | ||||
| -rw-r--r-- | tests/vb2_misc_tests.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/firmware/2lib/2misc.c b/firmware/2lib/2misc.c index 3775dcee..92e930a8 100644 --- a/firmware/2lib/2misc.c +++ b/firmware/2lib/2misc.c @@ -178,7 +178,7 @@ vb2_error_t vb2_fw_init_gbb(struct vb2_context *ctx) /* Keep on the work buffer permanently */ sd->gbb_offset = vb2_offset_of(sd, gbb); - vb2_set_workbuf_used(ctx, vb2_offset_of(ctx, wb.buf)); + vb2_set_workbuf_used(ctx, vb2_offset_of(sd, wb.buf)); /* Set any context flags based on GBB flags */ if (gbb->flags & VB2_GBB_FLAG_DISABLE_FWMP) diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c index 5f2b6c85..38806eaa 100644 --- a/tests/vb2_misc_tests.c +++ b/tests/vb2_misc_tests.c @@ -325,9 +325,9 @@ static void gbb_tests(void) original definition of vb2_get_gbb. */ struct vb2_gbb_header *current_gbb = vb2_member_of(sd, sd->gbb_offset); TEST_SUCC(memcmp(&gbbsrc, current_gbb, sizeof(gbbsrc)), - "copy gbb contents"); - TEST_EQ(used_before, sd->workbuf_used - sizeof(gbbsrc), - "unexpected workbuf size"); + " copy gbb contents"); + TEST_TRUE(sd->workbuf_used - sizeof(gbbsrc) - used_before + < VB2_WORKBUF_ALIGN, " unexpected workbuf size"); /* Workbuf failure */ reset_common_data(); |