X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=lttng-abi.c;h=3572e58ef8f64e948680c63d05cf1c23280d2821;hb=f4b27072a77b43af2fea72d6700bd64eb59a39f1;hp=8f63ad94c8fb053d9178aa91aa71d14d317f4e1b;hpb=92d9f5e6df0f72842b28ccd303569c88e183325a;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index 8f63ad94..3572e58e 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -130,10 +130,6 @@ int lttng_abi_tracepoint_list(void)
 	if (ret < 0)
 		goto open_error;
 	fd_install(file_fd, tracepoint_list_file);
-	if (file_fd < 0) {
-		ret = file_fd;
-		goto fd_error;
-	}
 	return file_fd;
 
 open_error:
@@ -174,10 +170,6 @@ int lttng_abi_syscall_list(void)
 	if (ret < 0)
 		goto open_error;
 	fd_install(file_fd, syscall_list_file);
-	if (file_fd < 0) {
-		ret = file_fd;
-		goto fd_error;
-	}
 	return file_fd;
 
 open_error:
@@ -1286,8 +1278,8 @@ int lttng_metadata_channel_release(struct inode *inode, struct file *file)
 	struct lttng_channel *channel = file->private_data;
 
 	if (channel) {
-		lttng_metadata_channel_destroy(channel);
 		fput(channel->session->file);
+		lttng_metadata_channel_destroy(channel);
 	}
 
 	return 0;