1 files changed, 6 insertions, 4 deletions

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 4f0d72ae6362..2561460d7baf 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -188,15 +188,17 @@ int function_graph_enter(unsigned long ret, unsigned long func,
         trace.func = func;
         trace.depth = ++current->curr_ret_depth;
 
-        /* Only trace if the calling function expects to */
-        if (!ftrace_graph_entry(&trace))
-                goto out;
-
         if (ftrace_push_return_trace(ret, func,
                                      frame_pointer, retp))
                 goto out;
 
+        /* Only trace if the calling function expects to */
+        if (!ftrace_graph_entry(&trace))
+                goto out_ret;
+
         return 0;
+ out_ret:
+        current->curr_ret_stack--;
  out:
         current->curr_ret_depth--;
         return -EBUSY;