Merge branch 'next-queue' into next

1 files changed, 2 insertions, 4 deletions

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index e814d2109f8e..a98fb376f249 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -170,12 +170,10 @@ static void keyring_describe(const struct key *keyring, struct seq_file *m)
 {
         struct keyring_list *klist;
 
-        if (keyring->description) {
+        if (keyring->description)
                 seq_puts(m, keyring->description);
-        }
-        else {
+        else
                 seq_puts(m, "[anon]");
-        }
 
         rcu_read_lock();
         klist = rcu_dereference(keyring->payload.subscriptions);