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; }