diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
| commit | 2e00fde5c6ed8535244332ebb55e881baa54ae46 (patch) | |
| tree | f578e02ef1dc6e59630f09404bb2f58500876811 /arch/x86/crypto/sha-mb/sha1_mb.c | |
| parent | 39f0ccde3624e7cf882faccf7f72a47b7a763bfb (diff) | |
| parent | 3231e2053eaeee70bdfb216a78a30f11e88e2243 (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'arch/x86/crypto/sha-mb/sha1_mb.c')
| -rw-r--r-- | arch/x86/crypto/sha-mb/sha1_mb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/crypto/sha-mb/sha1_mb.c b/arch/x86/crypto/sha-mb/sha1_mb.c index a8a0224fa0f8..081255cea1ee 100644 --- a/arch/x86/crypto/sha-mb/sha1_mb.c +++ b/arch/x86/crypto/sha-mb/sha1_mb.c @@ -453,10 +453,10 @@ static int sha_complete_job(struct mcryptd_hash_request_ctx *rctx, req = cast_mcryptd_ctx_to_req(req_ctx); if (irqs_disabled()) - rctx->complete(&req->base, ret); + req_ctx->complete(&req->base, ret); else { local_bh_disable(); - rctx->complete(&req->base, ret); + req_ctx->complete(&req->base, ret); local_bh_enable(); } } |