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

Conflicts:

	arch/x86/kernel/io_apic.c

1 files changed, 3 insertions, 3 deletions

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 7c72baa02f2e..6688765bd8b9 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -838,11 +838,11 @@ static long get_instantiation_keyring(key_serial_t ringid,
 {
         key_ref_t dkref;
 
+        *_dest_keyring = NULL;
+
         /* just return a NULL pointer if we weren't asked to make a link */
-        if (ringid == 0) {
-                *_dest_keyring = NULL;
+        if (ringid == 0)
                 return 0;
-        }
 
         /* if a specific keyring is nominated by ID, then use that */
         if (ringid > 0) {