diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
| commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
| tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /security/keys/process_keys.c | |
| parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
| parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) | |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
Diffstat (limited to 'security/keys/process_keys.c')
| -rw-r--r-- | security/keys/process_keys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index f8e7251ae2c8..504bdd2452bd 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c | |||
| @@ -207,7 +207,7 @@ static int install_process_keyring(void) | |||
| 207 | ret = install_process_keyring_to_cred(new); | 207 | ret = install_process_keyring_to_cred(new); |
| 208 | if (ret < 0) { | 208 | if (ret < 0) { |
| 209 | abort_creds(new); | 209 | abort_creds(new); |
| 210 | return ret != -EEXIST ?: 0; | 210 | return ret != -EEXIST ? ret : 0; |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | return commit_creds(new); | 213 | return commit_creds(new); |