[media] saa7146: fix querycap, vbi/video separation and g/s_register

The querycap ioctl returned an incorrect version number and incorrect
capabilities (mixing up vbi and video caps).

The reason for that was that video nodes could do vbi activities: that
should be separated between the vbi and video nodes.

There were also a few minor problems with dbg_g/s_register that have
been resolved. The mxb/saa7146 driver now passes the v4l2_compliance tests.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 37 insertions, 22 deletions

diff --git a/drivers/media/video/hexium_gemini.c b/drivers/media/video/hexium_gemini.c
index a62322d5c0d8..22650322d0a9 100644
--- a/drivers/media/video/hexium_gemini.c
+++ b/drivers/media/video/hexium_gemini.c
@@ -399,12 +399,12 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
         hexium->cur_input = 0;
 
         saa7146_vv_init(dev, &vv_data);
-        vv_data.ops.vidioc_queryctrl = vidioc_queryctrl;
-        vv_data.ops.vidioc_g_ctrl = vidioc_g_ctrl;
-        vv_data.ops.vidioc_s_ctrl = vidioc_s_ctrl;
-        vv_data.ops.vidioc_enum_input = vidioc_enum_input;
-        vv_data.ops.vidioc_g_input = vidioc_g_input;
-        vv_data.ops.vidioc_s_input = vidioc_s_input;
+        vv_data.vid_ops.vidioc_queryctrl = vidioc_queryctrl;
+        vv_data.vid_ops.vidioc_g_ctrl = vidioc_g_ctrl;
+        vv_data.vid_ops.vidioc_s_ctrl = vidioc_s_ctrl;
+        vv_data.vid_ops.vidioc_enum_input = vidioc_enum_input;
+        vv_data.vid_ops.vidioc_g_input = vidioc_g_input;
+        vv_data.vid_ops.vidioc_s_input = vidioc_s_input;
         ret = saa7146_register_device(&hexium->video_dev, dev, "hexium gemini", VFL_TYPE_GRABBER);
         if (ret < 0) {
                 pr_err("cannot register capture v4l2 device. skipping.\n");
diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c
index 23debc967d94..e549339f32d6 100644
--- a/drivers/media/video/hexium_orion.c
+++ b/drivers/media/video/hexium_orion.c
@@ -371,9 +371,9 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
         DEB_EE("\n");
 
         saa7146_vv_init(dev, &vv_data);
-        vv_data.ops.vidioc_enum_input = vidioc_enum_input;
-        vv_data.ops.vidioc_g_input = vidioc_g_input;
-        vv_data.ops.vidioc_s_input = vidioc_s_input;
+        vv_data.vid_ops.vidioc_enum_input = vidioc_enum_input;
+        vv_data.vid_ops.vidioc_g_input = vidioc_g_input;
+        vv_data.vid_ops.vidioc_s_input = vidioc_s_input;
         if (0 != saa7146_register_device(&hexium->video_dev, dev, "hexium orion", VFL_TYPE_GRABBER)) {
                 pr_err("cannot register capture v4l2 device. skipping.\n");
                 return -1;
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index db0c5ddec87f..d2d261291158 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -662,13 +662,28 @@ static int vidioc_g_register(struct file *file, void *fh, struct v4l2_dbg_regist
 {
         struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
 
-        return call_all(dev, core, g_register, reg);
+        if (!capable(CAP_SYS_ADMIN))
+                return -EPERM;
+        if (v4l2_chip_match_host(&reg->match)) {
+                reg->val = saa7146_read(dev, reg->reg);
+                reg->size = 4;
+                return 0;
+        }
+        call_all(dev, core, g_register, reg);
+        return 0;
 }
 
 static int vidioc_s_register(struct file *file, void *fh, struct v4l2_dbg_register *reg)
 {
         struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
 
+        if (!capable(CAP_SYS_ADMIN))
+                return -EPERM;
+        if (v4l2_chip_match_host(&reg->match)) {
+                saa7146_write(dev, reg->reg, reg->val);
+                reg->size = 4;
+                return 0;
+        }
         return call_all(dev, core, s_register, reg);
 }
 #endif
@@ -689,19 +704,19 @@ static int mxb_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data
         }
         mxb = (struct mxb *)dev->ext_priv;
 
-        vv_data.ops.vidioc_enum_input = vidioc_enum_input;
-        vv_data.ops.vidioc_g_input = vidioc_g_input;
-        vv_data.ops.vidioc_s_input = vidioc_s_input;
-        vv_data.ops.vidioc_g_tuner = vidioc_g_tuner;
-        vv_data.ops.vidioc_s_tuner = vidioc_s_tuner;
-        vv_data.ops.vidioc_g_frequency = vidioc_g_frequency;
-        vv_data.ops.vidioc_s_frequency = vidioc_s_frequency;
-        vv_data.ops.vidioc_enumaudio = vidioc_enumaudio;
-        vv_data.ops.vidioc_g_audio = vidioc_g_audio;
-        vv_data.ops.vidioc_s_audio = vidioc_s_audio;
+        vv_data.vid_ops.vidioc_enum_input = vidioc_enum_input;
+        vv_data.vid_ops.vidioc_g_input = vidioc_g_input;
+        vv_data.vid_ops.vidioc_s_input = vidioc_s_input;
+        vv_data.vid_ops.vidioc_g_tuner = vidioc_g_tuner;
+        vv_data.vid_ops.vidioc_s_tuner = vidioc_s_tuner;
+        vv_data.vid_ops.vidioc_g_frequency = vidioc_g_frequency;
+        vv_data.vid_ops.vidioc_s_frequency = vidioc_s_frequency;
+        vv_data.vid_ops.vidioc_enumaudio = vidioc_enumaudio;
+        vv_data.vid_ops.vidioc_g_audio = vidioc_g_audio;
+        vv_data.vid_ops.vidioc_s_audio = vidioc_s_audio;
 #ifdef CONFIG_VIDEO_ADV_DEBUG
-        vv_data.ops.vidioc_g_register = vidioc_g_register;
-        vv_data.ops.vidioc_s_register = vidioc_s_register;
+        vv_data.vid_ops.vidioc_g_register = vidioc_g_register;
+        vv_data.vid_ops.vidioc_s_register = vidioc_s_register;
 #endif
         if (saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {
                 ERR("cannot register capture v4l2 device. skipping.\n");