From 1f9a8e9df0e1d18abb420276e3f114b9b2d27b9d Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 30 Nov 2011 13:34:14 -0500 Subject: [PATCH] --- yaml --- r: 281217 b: refs/heads/master c: 2f8e0b31ad257bca9ff5dda9fdfdcc98d38d97f8 h: refs/heads/master i: 281215: 6931a6066d7f27f7787f3fdc4b0e604854de8ece v: v3 --- [refs] | 2 +- .../staging/lttng/lib/ringbuffer/ring_buffer_frontend.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2f260656452a..f7430a8ed97a 100644 --- 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 index 802f5cd4cd16..957d7f3d7ac6 100644 --- 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