diff options
| author | Gerd Knorr <devnull@localhost> | 2004-10-11 14:53:12 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-10-11 14:53:12 +0000 |
| commit | 3de5a0bda8a7e0289857223e3b645c0782aee2b7 (patch) | |
| tree | e8d872427c5bcf1f84d7c88a8510f6d08e24e4a9 /linux/drivers/media/video/saa7134 | |
| parent | 10a75fb37fbb1ab822371d834328d87a8409ff23 (diff) | |
| download | mediapointer-dvb-s2-3de5a0bda8a7e0289857223e3b645c0782aee2b7.tar.gz mediapointer-dvb-s2-3de5a0bda8a7e0289857223e3b645c0782aee2b7.tar.bz2 | |
- fix poll/select oops.
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-ts.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-video.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-ts.c b/linux/drivers/media/video/saa7134/saa7134-ts.c index 2df96839a..3c36c3cc9 100644 --- a/linux/drivers/media/video/saa7134/saa7134-ts.c +++ b/linux/drivers/media/video/saa7134/saa7134-ts.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-ts.c,v 1.8 2004/09/23 13:58:19 kraxel Exp $ + * $Id: saa7134-ts.c,v 1.9 2004/10/11 14:53:13 kraxel Exp $ * * device driver for philips saa7134 based TV cards * video4linux video interface @@ -265,7 +265,8 @@ ts_poll(struct file *file, struct poll_table_struct *wait) { struct saa7134_dev *dev = file->private_data; - return videobuf_poll_stream(file->private_data, &dev->ts.ts, wait); + return videobuf_poll_stream(file, file->private_data, + &dev->ts.ts, wait); } diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index 14cfff8d7..4d79c3dc6 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-video.c,v 1.14 2004/09/23 13:58:19 kraxel Exp $ + * $Id: saa7134-video.c,v 1.15 2004/10/11 14:53:13 kraxel Exp $ * * device driver for philips saa7134 based TV cards * video4linux video interface @@ -1294,7 +1294,8 @@ video_poll(struct file *file, struct poll_table_struct *wait) struct videobuf_buffer *buf = NULL; if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) - return videobuf_poll_stream(file->private_data, &fh->vbi, wait); + return videobuf_poll_stream(file, file->private_data, + &fh->vbi, wait); if (res_check(fh,RESOURCE_VIDEO)) { if (!list_empty(&fh->cap.stream)) |