summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bttv-driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/bttv-driver.c')
-rw-r--r--linux/drivers/media/video/bttv-driver.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index f432cad03..57a54b0ba 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,6 +1,6 @@
/*
- $Id: bttv-driver.c,v 1.20 2004/10/11 13:45:51 kraxel Exp $
+ $Id: bttv-driver.c,v 1.21 2004/10/11 14:53:12 kraxel Exp $
bttv - Bt848 frame grabber driver
@@ -2873,8 +2873,9 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait)
if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) {
if (!check_alloc_btres(fh->btv,fh,RESOURCE_VBI))
- return -EBUSY;
- return videobuf_poll_stream(file->private_data, &fh->vbi, wait);
+ return POLLERR;
+ return videobuf_poll_stream(file, file->private_data,
+ &fh->vbi, wait);
}
if (check_btres(fh,RESOURCE_VIDEO)) {