Merge tag 'mfd-fixes-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[mirror_ubuntu-artful-kernel.git] / drivers / md / dm-crypt.c

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 1cb2ca9dfae36d8df009aa9f68260ae7a071ba05..389a3637ffcc637c9a4540cec4db3b65a5cf773f 100644 (file)
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1536,7 +1536,7 @@ static int crypt_set_keyring_key(struct crypt_config *cc, const char *key_string
 
        down_read(&key->sem);
 
-       ukp = user_key_payload(key);
+       ukp = user_key_payload_locked(key);
        if (!ukp) {
                up_read(&key->sem);
                key_put(key);