---

yaml --- r: 306398 b: refs/heads/master c: 313fce7 h: refs/heads/master v: v3
git-mirror · May 14, 2012 · 0bf9985 · 0bf9985
1 parent 694a6a5
commit 0bf9985
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab49ae0f201f1e7e07250d011fffde8ed2530175
+refs/heads/master: 313fce750a073b041526f6e595f755f6233f8e73
diff --git a/trunk/drivers/media/dvb/ttpci/av7110_v4l.c b/trunk/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -811,6 +811,16 @@ int av7110_init_v4l(struct av7110 *av7110)
 	vv_data->vid_ops.vidioc_s_frequency = vidioc_s_frequency;
 	vv_data->vid_ops.vidioc_g_audio = vidioc_g_audio;
 	vv_data->vid_ops.vidioc_s_audio = vidioc_s_audio;
+
+	vv_data->vbi_ops.vidioc_enum_input = vidioc_enum_input;
+	vv_data->vbi_ops.vidioc_g_input = vidioc_g_input;
+	vv_data->vbi_ops.vidioc_s_input = vidioc_s_input;
+	vv_data->vbi_ops.vidioc_g_tuner = vidioc_g_tuner;
+	vv_data->vbi_ops.vidioc_s_tuner = vidioc_s_tuner;
+	vv_data->vbi_ops.vidioc_g_frequency = vidioc_g_frequency;
+	vv_data->vbi_ops.vidioc_s_frequency = vidioc_s_frequency;
+	vv_data->vbi_ops.vidioc_g_audio = vidioc_g_audio;
+	vv_data->vbi_ops.vidioc_s_audio = vidioc_s_audio;
 	vv_data->vbi_ops.vidioc_g_sliced_vbi_cap = vidioc_g_sliced_vbi_cap;
 	vv_data->vbi_ops.vidioc_g_fmt_sliced_vbi_out = vidioc_g_fmt_sliced_vbi_out;
 	vv_data->vbi_ops.vidioc_s_fmt_sliced_vbi_out = vidioc_s_fmt_sliced_vbi_out;

diff --git a/trunk/drivers/media/video/mxb.c b/trunk/drivers/media/video/mxb.c
@@ -575,6 +575,13 @@ static int vidioc_s_tuner(struct file *file, void *fh, struct v4l2_tuner *t)
 	return call_all(dev, tuner, s_tuner, t);
 }
 
+static int vidioc_querystd(struct file *file, void *fh, v4l2_std_id *norm)
+{
+	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
+
+	return call_all(dev, video, querystd, norm);
+}
+
 static int vidioc_g_frequency(struct file *file, void *fh, struct v4l2_frequency *f)
 {
 	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
@@ -707,6 +714,7 @@ static int mxb_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_data
 	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_querystd = vidioc_querystd;
 	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;