X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Flttng.c;h=c7c88f6315a0a8987912dc003979d0f8454247bd;hp=beb67ffb446afa430ab4ca34982e26b8237bb0a0;hb=f34daff7d0139d162e949f1b4fbb4cd003746b15;hpb=1b686c3f1859c4d5929e234c6e792c2bcab4cc8e

diff --git a/lttng/lttng.c b/lttng/lttng.c
index beb67ffb4..c7c88f631 100644
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -131,11 +131,12 @@ static int process_client_opt(void)
 
 		if (opt_event_list != NULL) {
 			ret = process_opt_kernel_event();
+			if (ret < 0) {
+				goto end;
+			}
 		} else {
 			// Enable all events
 		}
-
-		goto error;
 	}
 
 	if (opt_trace_pid != 0) {
@@ -521,7 +522,7 @@ static int validate_options(void)
 	}
 
 	/* If start trace, auto start tracing */
-	if (opt_start_trace) {
+	if (opt_start_trace || opt_event_list != NULL) {
 		DBG("Requesting auto tracing");
 		auto_trace = 1;
 	}