From 9c638b8cd403e896d3c176979b9ab47884699c82 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Red Hat)" <srostedt@redhat.com>
Date: Tue, 5 Mar 2013 10:53:02 -0500
Subject: [PATCH] --- yaml --- r: 361127 b: refs/heads/master c:
 c9960e48543799f168c4c9486f9790fb686ce5a8 h: refs/heads/master i:   361125:
 17efd29a007efd5ce8a1bf500934f719b641b3cd   361123:
 ef51d8bfcd08dd7aca4964274ec0be03108fb6ef   361119:
 40b4fdf373eb81353ff83f389f9fb788bccdc8a2 v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 49d917403b9b..e7b048506606 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8741e2e88ac9a458765a0c7b4e6542d7c038334
+refs/heads/master: c9960e48543799f168c4c9486f9790fb686ce5a8
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 9e3120b8a2ad..1f835a83cb2c 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -4167,8 +4167,6 @@ tracing_snapshot_write(struct file *filp, const char __user *ubuf, size_t cnt,
 	default:
 		if (current_trace->allocated_snapshot)
 			tracing_reset_online_cpus(&max_tr);
-		else
-			ret = -EINVAL;
 		break;
 	}