diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:00 -0400 |
| commit | 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (patch) | |
| tree | 07aea7539f78f221c6fc535a94a07befa2afdb63 /security/keys/request_key.c | |
| parent | f241be74b803dcf9d70c9978292946370654320f (diff) | |
| parent | 2ba84684e8cf6f980e4e95a2300f53a505eb794e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'security/keys/request_key.c')
| -rw-r--r-- | security/keys/request_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c index dfcd983af1fd..90c1506d007c 100644 --- 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, | |||
| 405 | key_user_put(user); | 405 | key_user_put(user); |
| 406 | 406 | ||
| 407 | /* link the new key into the appropriate keyring */ | 407 | /* link the new key into the appropriate keyring */ |
| 408 | if (!PTR_ERR(key)) | 408 | if (!IS_ERR(key)) |
| 409 | request_key_link(key, dest_keyring); | 409 | request_key_link(key, dest_keyring); |
| 410 | } | 410 | } |
| 411 | 411 | ||