git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
[pandora-kernel.git]
/
security
/
keys
/
request_key.c
diff --git
a/security/keys/request_key.c
b/security/keys/request_key.c
index
df3c041
..
b18a717
100644
(file)
--- 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 */
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);
if (!IS_ERR(key_ref)) {
key = key_ref_to_ptr(key_ref);