aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci/av7110_av.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/ttpci/av7110_av.c')
-rw-r--r--drivers/media/dvb/ttpci/av7110_av.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index 13efba942dac..952b33dbac4f 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -25,7 +25,7 @@
25 * Or, point your browser to http://www.gnu.org/copyleft/gpl.html 25 * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
26 * 26 *
27 * 27 *
28 * the project's page is at http://www.linuxtv.org/dvb/ 28 * the project's page is at http://www.linuxtv.org/
29 */ 29 */
30 30
31#include <linux/types.h> 31#include <linux/types.h>
@@ -245,8 +245,11 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)
245 return -1; 245 return -1;
246 } 246 }
247 while (1) { 247 while (1) {
248 if ((len = dvb_ringbuffer_avail(buf)) < 6) 248 len = dvb_ringbuffer_avail(buf);
249 if (len < 6) {
250 wake_up(&buf->queue);
249 return -1; 251 return -1;
252 }
250 sync = DVB_RINGBUFFER_PEEK(buf, 0) << 24; 253 sync = DVB_RINGBUFFER_PEEK(buf, 0) << 24;
251 sync |= DVB_RINGBUFFER_PEEK(buf, 1) << 16; 254 sync |= DVB_RINGBUFFER_PEEK(buf, 1) << 16;
252 sync |= DVB_RINGBUFFER_PEEK(buf, 2) << 8; 255 sync |= DVB_RINGBUFFER_PEEK(buf, 2) << 8;
@@ -1521,6 +1524,7 @@ static const struct file_operations dvb_video_fops = {
1521 .open = dvb_video_open, 1524 .open = dvb_video_open,
1522 .release = dvb_video_release, 1525 .release = dvb_video_release,
1523 .poll = dvb_video_poll, 1526 .poll = dvb_video_poll,
1527 .llseek = noop_llseek,
1524}; 1528};
1525 1529
1526static struct dvb_device dvbdev_video = { 1530static struct dvb_device dvbdev_video = {
@@ -1539,6 +1543,7 @@ static const struct file_operations dvb_audio_fops = {
1539 .open = dvb_audio_open, 1543 .open = dvb_audio_open,
1540 .release = dvb_audio_release, 1544 .release = dvb_audio_release,
1541 .poll = dvb_audio_poll, 1545 .poll = dvb_audio_poll,
1546 .llseek = noop_llseek,
1542}; 1547};
1543 1548
1544static struct dvb_device dvbdev_audio = { 1549static struct dvb_device dvbdev_audio = {