diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-09-06 05:34:44 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:36:58 -0400 |
commit | 9afb7377ef16a73d1ae7b089aa853e00a3facea8 (patch) | |
tree | 4b5935da7097240c194b5899e0bcd08388353c43 /drivers/media/video/saa7134/saa7134.h | |
parent | ac2b97b13e5627127b8e29dc0e1e1d7be03eaae4 (diff) |
V4L/DVB (8917): saa7134-empress: fix changing the capture standard for non-tuner inputs
When changing the standard the saa6752hs was not updated unless the input
was the TV tuner. The saa6752hs should be updated regardless of the input.
In addition the S_STD and G_STD ioctls for the mpeg video device didn't do
anything. This is now fixed: they behave just like S_STD and G_STD on the
video0 device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index a1e0dad1267b..5e7fc731fab1 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -662,6 +662,8 @@ int saa7134_i2c_register(struct saa7134_dev *dev); | |||
662 | int saa7134_i2c_unregister(struct saa7134_dev *dev); | 662 | int saa7134_i2c_unregister(struct saa7134_dev *dev); |
663 | void saa7134_i2c_call_clients(struct saa7134_dev *dev, | 663 | void saa7134_i2c_call_clients(struct saa7134_dev *dev, |
664 | unsigned int cmd, void *arg); | 664 | unsigned int cmd, void *arg); |
665 | int saa7134_i2c_call_saa6752(struct saa7134_dev *dev, | ||
666 | unsigned int cmd, void *arg); | ||
665 | 667 | ||
666 | 668 | ||
667 | /* ----------------------------------------------------------- */ | 669 | /* ----------------------------------------------------------- */ |
@@ -674,6 +676,7 @@ extern struct video_device saa7134_radio_template; | |||
674 | int saa7134_s_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, struct v4l2_control *c); | 676 | int saa7134_s_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, struct v4l2_control *c); |
675 | int saa7134_g_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, struct v4l2_control *c); | 677 | int saa7134_g_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, struct v4l2_control *c); |
676 | int saa7134_queryctrl(struct file *file, void *priv, struct v4l2_queryctrl *c); | 678 | int saa7134_queryctrl(struct file *file, void *priv, struct v4l2_queryctrl *c); |
679 | int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_std_id *id); | ||
677 | 680 | ||
678 | int saa7134_videoport_init(struct saa7134_dev *dev); | 681 | int saa7134_videoport_init(struct saa7134_dev *dev); |
679 | void saa7134_set_tvnorm_hw(struct saa7134_dev *dev); | 682 | void saa7134_set_tvnorm_hw(struct saa7134_dev *dev); |