Merge branch 'master' into next
[linux-3.10.git] / security / commoncap.c
index 97ac1f1..48b7e02 100644 (file)
@@ -948,7 +948,6 @@ changed:
        return commit_creds(new);
 
 no_change:
-       error = 0;
 error:
        abort_creds(new);
        return error;