git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../to-linus-stable/
[sfrench/cifs-2.6.git]
/
security
/
keys
/
request_key.c
diff --git
a/security/keys/request_key.c
b/security/keys/request_key.c
index dfcd983af1fd88405d28c7af2a002e3e141759e5..90c1506d007cc219c17ebd9c571d94b9c6a58ed9 100644
(file)
--- a/
security/keys/request_key.c
+++ b/
security/keys/request_key.c
@@
-405,7
+405,7
@@
struct key *request_key_and_link(struct key_type *type,
key_user_put(user);
/* link the new key into the appropriate keyring */
- if (!
PTR
_ERR(key))
+ if (!
IS
_ERR(key))
request_key_link(key, dest_keyring);
}