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/cx88/cx88-video.c | |
| 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/cx88/cx88-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 14d2cb074..eeccdb29b 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.38 2004/10/11 13:45:51 kraxel Exp $ + * $Id: cx88-video.c,v 1.39 2004/10/11 14:53:13 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -1033,8 +1033,12 @@ video_poll(struct file *file, struct poll_table_struct *wait) { struct cx8800_fh *fh = file->private_data; - if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) - return videobuf_poll_stream(file->private_data, &fh->vbiq, wait); + if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) { + if (!res_get(fh->dev,fh,RESOURCE_VBI)) + return POLLERR; + return videobuf_poll_stream(file, file->private_data, + &fh->vbiq, wait); + } /* FIXME */ return POLLERR; |