Merge tag 'dm-3.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[pandora-kernel.git] / crypto / chainiv.c

diff --git a/crypto/chainiv.c b/crypto/chainiv.c
index 834d8dd..9c294c8 100644 (file)
--- a/crypto/chainiv.c
+++ b/crypto/chainiv.c
@@ -126,7 +126,7 @@ static int async_chainiv_schedule_work(struct async_chainiv_ctx *ctx)
        int err = ctx->err;
 
        if (!ctx->queue.qlen) {
-               smp_mb__before_clear_bit();
+               smp_mb__before_atomic();
                clear_bit(CHAINIV_STATE_INUSE, &ctx->state);
 
                if (!ctx->queue.qlen ||