---

yaml --- r: 281219 b: refs/heads/master c: eeb34e2 h: refs/heads/master i: 281217: 1f9a8e9 281215: 6931a60 v: v3
git-mirror · Dec 1, 2011 · 635319a · 635319a
1 parent 4c288ae
commit 635319a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5f7787388da7562b955a36b46e909e500a5974b
+refs/heads/master: eeb34e2113576aea782094d1e30f22b445355fe8
diff --git a/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c b/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_mmap.c
@@ -80,9 +80,6 @@ static int lib_ring_buffer_mmap_buf(struct lib_ring_buffer *buf,
 	if (config->output != RING_BUFFER_MMAP)
 		return -EINVAL;
 
-	if (!buf)
-		return -EBADF;
-
 	mmap_buf_len = chan->backend.buf_size;
 	if (chan->backend.extra_reader_sb)
 		mmap_buf_len += chan->backend.subbuf_size;

diff --git a/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_vfs.c b/trunk/drivers/staging/lttng/lib/ringbuffer/ring_buffer_vfs.c
@@ -42,6 +42,9 @@ int lib_ring_buffer_open(struct inode *inode, struct file *file)
 	struct lib_ring_buffer *buf = inode->i_private;
 	int ret;
 
+	if (!buf)
+		return -EINVAL;
+
 	ret = lib_ring_buffer_open_read(buf);
 	if (ret)
 		return ret;