diff options
author | Tudor Ambarus <tudor.ambarus@linaro.org> | 2023-02-06 11:23:34 +0200 |
---|---|---|
committer | Tudor Ambarus <tudor.ambarus@linaro.org> | 2023-02-06 11:23:34 +0200 |
commit | f047382519ca41702ebaee5a862e87390f687137 (patch) | |
tree | 3108abb624004c540551bb9a954ac71fea696886 /lib/kunit/string-stream.c | |
parent | 893fd950c89d516a7cf365700b2bd7bb3efc15a5 (diff) | |
parent | c0f7ae27539fbac267384a7bfc58296ea7550d52 (diff) |
Merge tag 'mtd/fixes-for-6.2-rc4' into spi-nor/next
Merge 'mtd/fixes-for-6.2-rc4' into spi-nor/next to fix conflict on
include headers in drivers/mtd/spi-nor/core.c.
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Diffstat (limited to 'lib/kunit/string-stream.c')
-rw-r--r-- | lib/kunit/string-stream.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/kunit/string-stream.c b/lib/kunit/string-stream.c index f5f51166d8c2..cc32743c1171 100644 --- a/lib/kunit/string-stream.c +++ b/lib/kunit/string-stream.c @@ -23,8 +23,10 @@ static struct string_stream_fragment *alloc_string_stream_fragment( return ERR_PTR(-ENOMEM); frag->fragment = kunit_kmalloc(test, len, gfp); - if (!frag->fragment) + if (!frag->fragment) { + kunit_kfree(test, frag); return ERR_PTR(-ENOMEM); + } return frag; } |