diff options
Diffstat (limited to 'crypto/api.c')
-rw-r--r-- | crypto/api.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/crypto/api.c b/crypto/api.c index 56b6e0e66311..22385cac90bb 100644 --- a/crypto/api.c +++ b/crypto/api.c | |||
@@ -453,8 +453,8 @@ err: | |||
453 | } | 453 | } |
454 | EXPORT_SYMBOL_GPL(crypto_alloc_base); | 454 | EXPORT_SYMBOL_GPL(crypto_alloc_base); |
455 | 455 | ||
456 | struct crypto_tfm *crypto_create_tfm(struct crypto_alg *alg, | 456 | void *crypto_create_tfm(struct crypto_alg *alg, |
457 | const struct crypto_type *frontend) | 457 | const struct crypto_type *frontend) |
458 | { | 458 | { |
459 | char *mem; | 459 | char *mem; |
460 | struct crypto_tfm *tfm = NULL; | 460 | struct crypto_tfm *tfm = NULL; |
@@ -488,9 +488,9 @@ out_free_tfm: | |||
488 | crypto_shoot_alg(alg); | 488 | crypto_shoot_alg(alg); |
489 | kfree(mem); | 489 | kfree(mem); |
490 | out_err: | 490 | out_err: |
491 | tfm = ERR_PTR(err); | 491 | mem = ERR_PTR(err); |
492 | out: | 492 | out: |
493 | return tfm; | 493 | return mem; |
494 | } | 494 | } |
495 | EXPORT_SYMBOL_GPL(crypto_create_tfm); | 495 | EXPORT_SYMBOL_GPL(crypto_create_tfm); |
496 | 496 | ||
@@ -514,12 +514,11 @@ EXPORT_SYMBOL_GPL(crypto_create_tfm); | |||
514 | * | 514 | * |
515 | * In case of error the return value is an error pointer. | 515 | * In case of error the return value is an error pointer. |
516 | */ | 516 | */ |
517 | struct crypto_tfm *crypto_alloc_tfm(const char *alg_name, | 517 | void *crypto_alloc_tfm(const char *alg_name, |
518 | const struct crypto_type *frontend, | 518 | const struct crypto_type *frontend, u32 type, u32 mask) |
519 | u32 type, u32 mask) | ||
520 | { | 519 | { |
521 | struct crypto_alg *(*lookup)(const char *name, u32 type, u32 mask); | 520 | struct crypto_alg *(*lookup)(const char *name, u32 type, u32 mask); |
522 | struct crypto_tfm *tfm; | 521 | void *tfm; |
523 | int err; | 522 | int err; |
524 | 523 | ||
525 | type &= frontend->maskclear; | 524 | type &= frontend->maskclear; |