---

yaml --- r: 281217 b: refs/heads/master c: 2f8e0b3 h: refs/heads/master i: 281215: 6931a60 v: v3
git-mirror · Dec 1, 2011 · 1f9a8e9 · 1f9a8e9
1 parent 2d2c44b
commit 1f9a8e9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 976d534118219b04277fb6cfcdb71607b730746d
+refs/heads/master: 2f8e0b31ad257bca9ff5dda9fdfdcc98d38d97f8
diff --git a/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_frontend.c b/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_frontend.c
@@ -1143,12 +1143,6 @@ void lib_ring_buffer_print_buffer_errors(struct lib_ring_buffer *buf,
 	const struct lib_ring_buffer_config *config = chan->backend.config;
 	unsigned long write_offset, cons_offset;
 
-	/*
-	 * Can be called in the error path of allocation when
-	 * trans_channel_data is not yet set.
-	 */
-	if (!chan)
-		return;
 	/*
 	 * No need to order commit_count, write_offset and cons_offset reads
 	 * because we execute at teardown when no more writer nor reader