diff options
author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-05-20 15:31:34 +0200 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-05-20 15:31:34 +0200 |
commit | cd574ee16ffa2f2cad8414b9c59520e3e08a77f9 (patch) | |
tree | 8511c7a250b9bd6f6b0285f7fdfb05cd917c0373 /crypto/crct10dif_generic.c | |
parent | 831fd9fdce82ad6727c15552b430c5e54420d92f (diff) | |
parent | 8648646bd7927eccf4334248e94827d5dd47acf9 (diff) | |
download | linux-crypto-cd574ee16ffa2f2cad8414b9c59520e3e08a77f9.tar.gz linux-crypto-cd574ee16ffa2f2cad8414b9c59520e3e08a77f9.zip |
Merge tag 'v5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 5.2-rc1
Sync with upstream (which now contains fbdev-v5.2 changes) to
prepare a base for fbdev-v5.3 changes.
Diffstat (limited to '')
-rw-r--r-- | crypto/crct10dif_generic.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/crypto/crct10dif_generic.c b/crypto/crct10dif_generic.c index 8e94e29d..d90c0070 100644 --- a/crypto/crct10dif_generic.c +++ b/crypto/crct10dif_generic.c @@ -65,10 +65,9 @@ static int chksum_final(struct shash_desc *desc, u8 *out) return 0; } -static int __chksum_finup(__u16 *crcp, const u8 *data, unsigned int len, - u8 *out) +static int __chksum_finup(__u16 crc, const u8 *data, unsigned int len, u8 *out) { - *(__u16 *)out = crc_t10dif_generic(*crcp, data, len); + *(__u16 *)out = crc_t10dif_generic(crc, data, len); return 0; } @@ -77,15 +76,13 @@ static int chksum_finup(struct shash_desc *desc, const u8 *data, { struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); - return __chksum_finup(&ctx->crc, data, len, out); + return __chksum_finup(ctx->crc, data, len, out); } static int chksum_digest(struct shash_desc *desc, const u8 *data, unsigned int length, u8 *out) { - struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); - - return __chksum_finup(&ctx->crc, data, length, out); + return __chksum_finup(0, data, length, out); } static struct shash_alg alg = { @@ -115,7 +112,7 @@ static void __exit crct10dif_mod_fini(void) crypto_unregister_shash(&alg); } -module_init(crct10dif_mod_init); +subsys_initcall(crct10dif_mod_init); module_exit(crct10dif_mod_fini); MODULE_AUTHOR("Tim Chen <tim.c.chen@linux.intel.com>"); |