From ff38989c9dc34d779fc1fc654390a452b4205240 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 20 Dec 2012 15:05:54 -0800 Subject: [PATCH] --- yaml --- r: 347891 b: refs/heads/master c: e67eab39bee26f509d38d00ca1a8f24b63f46a31 h: refs/heads/master i: 347889: 3403189a98fbb04357d7ec080d8c5f2350163fa7 347887: 7e1a77266f080e719b60a5071773340b7784a3c1 v: v3 --- [refs] | 2 +- trunk/security/keys/process_keys.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 009bfc1920c3..7153549d1f99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a68c2f12b4b28994aaf622bbe5724b7258cc2fcf +refs/heads/master: e67eab39bee26f509d38d00ca1a8f24b63f46a31 diff --git a/trunk/security/keys/process_keys.c b/trunk/security/keys/process_keys.c index 58dfe0890947..20e4bf57aec8 100644 --- a/trunk/security/keys/process_keys.c +++ b/trunk/security/keys/process_keys.c @@ -367,8 +367,6 @@ key_ref_t search_my_process_keyrings(struct key_type *type, switch (PTR_ERR(key_ref)) { case -EAGAIN: /* no key */ - if (ret) - break; case -ENOKEY: /* negative key */ ret = key_ref; break;