diff options
author | James Morris <jmorris@namei.org> | 2011-03-30 08:51:46 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-03-30 08:51:46 +1100 |
commit | 93b9c98b3498db5842e2812b32cff4c1ae947eb1 (patch) | |
tree | 2d18e46cadcbf66fff695bb16e86531281cde7be /security/keys/request_key.c | |
parent | efb3bb4fad062f8e9b8c9c945d499597e14007e7 (diff) | |
parent | 5806896019ceaa0a1e808182afb4bba33c948ad6 (diff) |
Merge branch 'next-queue' into next
Diffstat (limited to 'security/keys/request_key.c')
-rw-r--r-- | security/keys/request_key.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c index df3c0417ee4..b18a7174590 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c @@ -530,8 +530,7 @@ struct key *request_key_and_link(struct key_type *type, dest_keyring, flags); /* search all the process keyrings for a key */ - key_ref = search_process_keyrings(type, description, type->match, - cred); + key_ref = search_process_keyrings(type, description, type->match, cred); if (!IS_ERR(key_ref)) { key = key_ref_to_ptr(key_ref); |