Merge commit 'v2.6.30' into for-2.6.31

[safe/jmp/linux-2.6] / security / commoncap.c

diff --git a/security/commoncap.c b/security/commoncap.c
index 7cd61a5..beac025 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -916,7 +916,6 @@ changed:
        return commit_creds(new);
 
 no_change:
-       error = 0;
 error:
        abort_creds(new);
        return error;