diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-05-28 07:58:12 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-05-28 07:58:12 +0200 |
commit | 0bffedbce90818228f554651baf8d7c75f2876d8 (patch) | |
tree | 96101208e0200c70c6688737ac6596bdd0ed2950 /crypto/lrw.c | |
parent | perf/core: Replace zero-length array with flexible-array (diff) | |
parent | Linux 5.7-rc7 (diff) | |
download | wireguard-linux-0bffedbce90818228f554651baf8d7c75f2876d8.tar.xz wireguard-linux-0bffedbce90818228f554651baf8d7c75f2876d8.zip |
Merge tag 'v5.7-rc7' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'crypto/lrw.c')
-rw-r--r-- | crypto/lrw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/lrw.c b/crypto/lrw.c index 376d7ed3f1f8..3c734b81b3a2 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c @@ -287,7 +287,7 @@ static void exit_tfm(struct crypto_skcipher *tfm) crypto_free_skcipher(ctx->child); } -static void free(struct skcipher_instance *inst) +static void free_inst(struct skcipher_instance *inst) { crypto_drop_skcipher(skcipher_instance_ctx(inst)); kfree(inst); @@ -400,12 +400,12 @@ static int create(struct crypto_template *tmpl, struct rtattr **tb) inst->alg.encrypt = encrypt; inst->alg.decrypt = decrypt; - inst->free = free; + inst->free = free_inst; err = skcipher_register_instance(tmpl, inst); if (err) { err_free_inst: - free(inst); + free_inst(inst); } return err; } |