Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / crypto / chainiv.c

diff --git a/crypto/chainiv.c b/crypto/chainiv.c
index ba200b07449d259cebf846a43e3f768e335606ef..834d8dd3d4fc7abf1c72da93cb24f81632989239 100644 (file)
--- a/crypto/chainiv.c
+++ b/crypto/chainiv.c
@@ -291,9 +291,8 @@ static struct crypto_instance *chainiv_alloc(struct rtattr **tb)
        int err;
 
        algt = crypto_get_attr_type(tb);
-       err = PTR_ERR(algt);
        if (IS_ERR(algt))
-               return ERR_PTR(err);
+               return ERR_CAST(algt);
 
        err = crypto_get_default_rng();
        if (err)