Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[profile/ivi/kernel-adaptation-intel-automotive.git] / kernel / capability.c

diff --git a/kernel/capability.c b/kernel/capability.c
index df62f53..688926e 100644 (file)
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -280,9 +280,7 @@ asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t data)
        if (ret < 0)
                goto error;
 
-       ret = audit_log_capset(pid, new, current_cred());
-       if (ret < 0)
-               return ret;
+       audit_log_capset(pid, new, current_cred());
 
        return commit_creds(new);