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

[sfrench/cifs-2.6.git] / lib / digsig.c

diff --git a/lib/digsig.c b/lib/digsig.c
index 2f31e6a45f0af3f4e4bccd38aeb1d8324c72eeff..8793aeda30ca36a72106d3649b62456f00cc7c56 100644 (file)
--- a/lib/digsig.c
+++ b/lib/digsig.c
@@ -209,7 +209,7 @@ int digsig_verify(struct key *keyring, const char *sig, int siglen,
                kref = keyring_search(make_key_ref(keyring, 1UL),
                                                &key_type_user, name);
                if (IS_ERR(kref))
-                       key = ERR_PTR(PTR_ERR(kref));
+                       key = ERR_CAST(kref);
                else
                        key = key_ref_to_ptr(kref);
        } else {