Merge branch 'master' into next

[karo-tx-linux.git] / security / commoncap.c

diff --git a/security/commoncap.c b/security/commoncap.c
index 97ac1f16771761c9889ab8ec24d85b2b2e427341..48b7e0228fa38455ee6c2bf0cb37876e96c99afb 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -948,7 +948,6 @@ changed:
        return commit_creds(new);
 
 no_change:
-       error = 0;
 error:
        abort_creds(new);
        return error;