X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=094fe4adf75fd68b80cfed7e3665309340efc753;hp=77497d570b68e3e10aaf2a2386321ac66bd55d8c;hb=b3c750d2ffae77322752a5b4f43bd4ddae3dfea6;hpb=bbd973c2ec2a0485e0b545f88cd1b1262fff3296

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 77497d570..094fe4adf 100644
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -609,7 +609,7 @@ static int update_kernel_stream(int fd)
 				DBG("Channel found, updating kernel streams");
 				ret = kernel_open_channel_stream(channel);
 				if (ret < 0) {
-					goto end;
+					goto error;
 				}
 
 				/*
@@ -620,20 +620,20 @@ static int update_kernel_stream(int fd)
 					ret = send_kconsumerd_channel_fds(session->kernel_session->consumer_fd,
 							channel);
 					if (ret < 0) {
-						goto end;
+						goto error;
 					}
 				}
-				goto end;
+				goto error;
 			}
 		}
 		unlock_session(session);
 	}
+	unlock_session_list();
+	return ret;
 
-end:
+error:
+	unlock_session(session);
 	unlock_session_list();
-	if (session) {
-		unlock_session(session);
-	}
 	return ret;
 }