diff options
| author | Andreas Oberritter <obi@linuxtv.org> | 2006-03-14 17:30:09 -0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 08:53:27 -0800 |
| commit | 4304954eb668ce66fc58f1cab9abb9a9e2584549 (patch) | |
| tree | d0cfb5b30f033ce3736c1977d71d984d7074cbf3 /drivers/media | |
| parent | 19478843e4f8af7de9b297876519ee8b98c2f5ad (diff) | |
| download | linux-3.10-4304954eb668ce66fc58f1cab9abb9a9e2584549.tar.gz linux-3.10-4304954eb668ce66fc58f1cab9abb9a9e2584549.tar.bz2 linux-3.10-4304954eb668ce66fc58f1cab9abb9a9e2584549.zip | |
V4L/DVB (3500): Ringbuffer: don't reset pointers to zero
Oliver Endriss spotted, that resetting read and write pointers on
flush() requires additional locking and breaks the av7110 driver.
Therefore this patch partially reverts the previous patch titled "make
dvb_ringbuffer compatible to dmxdev_buffer".
Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/dvb/dvb-core/dvb_ringbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c b/drivers/media/dvb/dvb-core/dvb_ringbuffer.c index f233248358c..c972fe014c5 100644 --- a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c +++ b/drivers/media/dvb/dvb-core/dvb_ringbuffer.c @@ -87,7 +87,7 @@ ssize_t dvb_ringbuffer_avail(struct dvb_ringbuffer *rbuf) void dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf) { - rbuf->pread = rbuf->pwrite = 0; + rbuf->pread = rbuf->pwrite; rbuf->error = 0; } |