Merge branch 'merge' into powerpc-next

1 files changed, 6 insertions, 5 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index b7d3709cc452..e8692a5748c2 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -572,16 +572,17 @@ void audit_send_reply(int pid, int seq, int type, int done, int multi,
 
         skb = audit_make_reply(pid, seq, type, done, multi, payload, size);
         if (!skb)
-                return;
+                goto out;
 
         reply->pid = pid;
         reply->skb = skb;
 
         tsk = kthread_run(audit_send_reply_thread, reply, "audit_send_reply");
-        if (IS_ERR(tsk)) {
-                kfree(reply);
-                kfree_skb(skb);
-        }
+        if (!IS_ERR(tsk))
+                return;
+        kfree_skb(skb);
+out:
+        kfree(reply);
 }
 
 /*