git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
dvb
/
dvb-core
/
dvb_ringbuffer.c
diff --git
a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
b/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
index
77ad241
..
9878183
100644
(file)
--- a/
drivers/media/dvb/dvb-core/dvb_ringbuffer.c
+++ b/
drivers/media/dvb/dvb-core/dvb_ringbuffer.c
@@
-26,7
+26,6
@@
-#define __KERNEL_SYSCALLS__
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@
-45,6
+44,7
@@
void dvb_ringbuffer_init(struct dvb_ringbuffer *rbuf, void *data, size_t len)
rbuf->pread=rbuf->pwrite=0;
rbuf->data=data;
rbuf->size=len;
rbuf->pread=rbuf->pwrite=0;
rbuf->data=data;
rbuf->size=len;
+ rbuf->error=0;
init_waitqueue_head(&rbuf->queue);
init_waitqueue_head(&rbuf->queue);
@@
-87,6
+87,7
@@
ssize_t dvb_ringbuffer_avail(struct dvb_ringbuffer *rbuf)
void dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf)
{
rbuf->pread = rbuf->pwrite;
void dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf)
{
rbuf->pread = rbuf->pwrite;
+ rbuf->error = 0;
}
}