1 files changed, 34 insertions, 4 deletions

diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 09ec964dec5c..b614612be7b4 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -253,7 +253,10 @@ static int fops_open(struct inode *inode, struct file *file)
 
         if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
                 DEB_S(("initializing vbi...\n"));
-                result = saa7146_vbi_uops.open(dev,file);
+                if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
+                        result = saa7146_vbi_uops.open(dev,file);
+                if (dev->ext_vv_data->vbi_fops.open)
+                        dev->ext_vv_data->vbi_fops.open(inode, file);
         } else {
                 DEB_S(("initializing video...\n"));
                 result = saa7146_video_uops.open(dev,file);
@@ -289,7 +292,10 @@ static int fops_release(struct inode *inode, struct file *file)
                 return -ERESTARTSYS;
 
         if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
-                saa7146_vbi_uops.release(dev,file);
+                if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
+                        saa7146_vbi_uops.release(dev,file);
+                if (dev->ext_vv_data->vbi_fops.release)
+                        dev->ext_vv_data->vbi_fops.release(inode, file);
         } else {
                 saa7146_video_uops.release(dev,file);
         }
@@ -332,6 +338,7 @@ static int fops_mmap(struct file *file, struct vm_area_struct * vma)
                 BUG();
                 return 0;
         }
+
         return videobuf_mmap_mapper(q,vma);
 }
 
@@ -381,7 +388,10 @@ static ssize_t fops_read(struct file *file, char __user *data, size_t count, lof
                 }
         case V4L2_BUF_TYPE_VBI_CAPTURE: {
 //              DEB_EE(("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, data:%p, count:%lu\n", file, data, (unsigned long)count));
-                return saa7146_vbi_uops.read(file,data,count,ppos);
+                if (fh->dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
+                        return saa7146_vbi_uops.read(file,data,count,ppos);
+                else
+                        return -EINVAL;
                 }
                 break;
         default:
@@ -390,12 +400,31 @@ static ssize_t fops_read(struct file *file, char __user *data, size_t count, lof
         }
 }
 
+static ssize_t fops_write(struct file *file, const char __user *data, size_t count, loff_t *ppos)
+{
+        struct saa7146_fh *fh = file->private_data;
+
+        switch (fh->type) {
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+                return -EINVAL;
+        case V4L2_BUF_TYPE_VBI_CAPTURE:
+                if (fh->dev->ext_vv_data->vbi_fops.write)
+                        return fh->dev->ext_vv_data->vbi_fops.write(file, data, count, ppos);
+                else
+                        return -EINVAL;
+        default:
+                BUG();
+                return -EINVAL;
+        }
+}
+
 static struct file_operations video_fops =
 {
         .owner          = THIS_MODULE,
         .open           = fops_open,
         .release        = fops_release,
         .read           = fops_read,
+        .write          = fops_write,
         .poll           = fops_poll,
         .mmap           = fops_mmap,
         .ioctl          = fops_ioctl,
@@ -467,7 +496,8 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
         memset(vv->d_clipping.cpu_addr, 0x0, SAA7146_CLIPPING_MEM);
 
         saa7146_video_uops.init(dev,vv);
-        saa7146_vbi_uops.init(dev,vv);
+        if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
+                saa7146_vbi_uops.init(dev,vv);
 
         dev->vv_data = vv;
         dev->vv_callback = &vv_callback;