From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 15 Sep 2011 18:26:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.lttng.org/home/git/lttng-modules
X-Git-Tag: v2.0-pre9~69
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=69e6fcd16e0dd921a897e26b6655131f2afe98ea;hp=47655e60c5056528396c608191cfc5476da9cfab;p=lttng-modules.git

Merge branch 'master' of ssh://git.lttng.org/home/git/lttng-modules
---

diff --git a/lib/ringbuffer/ring_buffer_frontend.c b/lib/ringbuffer/ring_buffer_frontend.c
index 6a4c241e..3003dd83 100644
--- a/lib/ringbuffer/ring_buffer_frontend.c
+++ b/lib/ringbuffer/ring_buffer_frontend.c
@@ -752,8 +752,8 @@ void *channel_destroy(struct channel *chan)
 	ACCESS_ONCE(chan->finalized) = 1;
 	wake_up_interruptible(&chan->hp_wait);
 	wake_up_interruptible(&chan->read_wait);
-	kref_put(&chan->ref, channel_release);
 	priv = chan->backend.priv;
+	kref_put(&chan->ref, channel_release);
 	return priv;
 }
 EXPORT_SYMBOL_GPL(channel_destroy);