Merge "KEYS: potential uninitialized variable"

security/keys/key.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -580,7 +580,7 @@ int key_reject_and_link(struct key *key,

		mutex_unlock(&key_construction_mutex);

		if (keyring)
		if (keyring && link_ret == 0)
		__key_link_end(keyring, &key->index_key, edit);

		/* wake up anyone waiting for a key to be constructed */