summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2010-08-02 18:27:32 +0200
committerMiloslav Trmač <mitr@redhat.com>2010-08-02 18:27:32 +0200
commit636cb4601bdfc07021bf4f53dcb01139cac8edc2 (patch)
tree33753482833f9258fcdfde33f1b94fb4415d1292 /crypto
parent49d7012c4c62f6681378a56d9af4d721178b8ad3 (diff)
parent18eece9dddd1a4a083a8885611e432728848f22c (diff)
downloadkernel-crypto-636cb4601bdfc07021bf4f53dcb01139cac8edc2.tar.gz
kernel-crypto-636cb4601bdfc07021bf4f53dcb01139cac8edc2.tar.xz
kernel-crypto-636cb4601bdfc07021bf4f53dcb01139cac8edc2.zip
Merge branch 'standalone-master' into standalone-rename
Diffstat (limited to 'crypto')
-rw-r--r--crypto/userspace/ncr-key.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/userspace/ncr-key.c b/crypto/userspace/ncr-key.c
index d4f32b1ef85..13bdb181aaa 100644
--- a/crypto/userspace/ncr-key.c
+++ b/crypto/userspace/ncr-key.c
@@ -448,7 +448,8 @@ size_t size;
algo = _ncr_algo_to_properties(gen.params.algorithm);
if (algo == NULL) {
err();
- return ret;
+ ret = -EINVAL;
+ goto fail;
}
item->type = algo->key_type;
if (item->type == NCR_KEY_TYPE_SECRET) {