X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-ctl%2Fustctl.c;h=795022a15881e84a3c66c5c4f66a5ffd3e6a7da4;hb=cce4cff6e966e6d8f6839dcd448a7fa57a1f51c4;hp=46a1c89dee6f568a21188c12c840fe79222280be;hpb=662d05907560345f06a19463ce5bf24ca72a442c;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-ctl/ustctl.c b/src/lib/lttng-ust-ctl/ustctl.c
index 46a1c89d..795022a1 100644
--- a/src/lib/lttng-ust-ctl/ustctl.c
+++ b/src/lib/lttng-ust-ctl/ustctl.c
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-only
  *
- * Copyright (C) 2011 Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011-2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
@@ -394,15 +394,15 @@ int lttng_ust_ctl_add_context(int sock, struct lttng_ust_context_attr *ctx,
 	}
 	ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
 	if (ret < 0) {
+		if (ret == -EINVAL) {
+			/*
+			 * Command unknown from remote end. The communication socket is
+			 * now out-of-sync and needs to be shutdown.
+			 */
+			(void) ustcomm_shutdown_unix_sock(sock);
+		}
 		goto end;
-	} else if (ret == -EINVAL) {
-		/*
-		 * Command unknown from remote end. The communication socket is
-		 * now out-of-sync and needs to be shutdown.
-		 */
-		(void) ustcomm_shutdown_unix_sock(sock);
 	}
-
 	context_data->handle = -1;
 	DBG("Context created successfully");
 	*_context_data = context_data;