Merge branch 'next' into for-linus
[linux-2.6.git] / kernel / capability.c
index df62f53f84acc03be44c318c50a6a5b198d7e3b1..688926e496be18737d8ae37af9fe807f75185f56 100644 (file)
@@ -280,9 +280,7 @@ asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t data)
        if (ret < 0)
                goto error;
 
        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);
 
 
        return commit_creds(new);