diff --git a/[refs] b/[refs]
index cdbac9f92fca..e712a08d4b77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94523e818f283d3c69f621406f633afff46dbf82
+refs/heads/master: b06a830183b610c0a88c29a92feb7991a867ab46
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 757ae6f7e648..2129ab9d2a48 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -610,13 +610,12 @@ void tracing_start(void)
 		return;
 
 	spin_lock_irqsave(&tracing_start_lock, flags);
-	if (--trace_stop_count)
-		goto out;
-
-	if (trace_stop_count < 0) {
-		/* Someone screwed up their debugging */
-		WARN_ON_ONCE(1);
-		trace_stop_count = 0;
+	if (--trace_stop_count) {
+		if (trace_stop_count < 0) {
+			/* Someone screwed up their debugging */
+			WARN_ON_ONCE(1);
+			trace_stop_count = 0;
+		}
 		goto out;
 	}