diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-21 10:27:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-21 10:27:13 -0800 |
| commit | f02361639a481771130db5e67933c4f414377fce (patch) | |
| tree | f7ac573fa972ddd65731d96f723b2a8941c58bc3 | |
| parent | f7b36dc5cb37615b568b7161ddc53d604973ec8b (diff) | |
| parent | 19d8e9149c27b689c6224f5c84b96a159342195a (diff) | |
| download | bluetooth-next-f02361639a481771130db5e67933c4f414377fce.tar.gz | |
Merge tag 'pstore-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore fix from Kees Cook:
"Fix a CONFIG typo (Jiri Bohac)"
* tag 'pstore-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
pstore: Fix typo in compression option name
| -rw-r--r-- | fs/pstore/platform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 32f64abc277c3f..d963ae7902f92f 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -269,7 +269,7 @@ static int pstore_compress(const void *in, void *out, { int ret; - if (!IS_ENABLED(CONFIG_PSTORE_COMPRESSION)) + if (!IS_ENABLED(CONFIG_PSTORE_COMPRESS)) return -EINVAL; ret = crypto_comp_compress(tfm, in, inlen, out, &outlen); @@ -671,7 +671,7 @@ static void decompress_record(struct pstore_record *record) int unzipped_len; char *unzipped, *workspace; - if (!IS_ENABLED(CONFIG_PSTORE_COMPRESSION) || !record->compressed) + if (!IS_ENABLED(CONFIG_PSTORE_COMPRESS) || !record->compressed) return; /* Only PSTORE_TYPE_DMESG support compression. */ |