aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-04-01 02:15:52 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 20:44:26 -0400
commit3ff4ad815c5824ab35375d72ea8fe14fb3230daa (patch)
tree58f3b75b5b97f5dbf0bb129423c766c1fa4c86fd /drivers/media/video/ivtv
parent940088a16221fa517f5b921266afa8e46f49b784 (diff)
V4L/DVB (11377): v4l: increase version numbers of drivers converted to v4l2_subdev.
With all the v4l2_subdev changes that were made to these drivers it is a good idea to increase the version number of each driver. It's just the patch level that is increased, except for the zoran and saa7146 drivers where the minor number was increased due to the more substantial changes that were made to those two drivers. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv')
-rw-r--r--drivers/media/video/ivtv/ivtv-driver.c7
-rw-r--r--drivers/media/video/ivtv/ivtv-fileops.c15
2 files changed, 7 insertions, 15 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 07d5ffea6e6f..b0195e8ee4d1 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -884,12 +884,9 @@ static void ivtv_load_and_init_modules(struct ivtv *itv)
884 } 884 }
885 else if (itv->card->type == IVTV_CARD_GV_MVPRX || 885 else if (itv->card->type == IVTV_CARD_GV_MVPRX ||
886 itv->card->type == IVTV_CARD_GV_MVPRX2E) { 886 itv->card->type == IVTV_CARD_GV_MVPRX2E) {
887 struct v4l2_crystal_freq crystal_freq;
888
889 /* The crystal frequency of GVMVPRX is 24.576MHz */ 887 /* The crystal frequency of GVMVPRX is 24.576MHz */
890 crystal_freq.freq = SAA7115_FREQ_24_576_MHZ; 888 v4l2_subdev_call(itv->sd_video, video, s_crystal_freq,
891 crystal_freq.flags = SAA7115_FREQ_FL_UCGC; 889 SAA7115_FREQ_24_576_MHZ, SAA7115_FREQ_FL_UCGC);
892 v4l2_subdev_call(itv->sd_video, video, s_crystal_freq, &crystal_freq);
893 } 890 }
894 891
895 if (hw & IVTV_HW_CX25840) { 892 if (hw & IVTV_HW_CX25840) {
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index e212337c6513..e707ef3086b2 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -860,12 +860,9 @@ int ivtv_v4l2_close(struct file *filp)
860 ivtv_call_all(itv, core, s_std, itv->std); 860 ivtv_call_all(itv, core, s_std, itv->std);
861 /* Select correct audio input (i.e. TV tuner or Line in) */ 861 /* Select correct audio input (i.e. TV tuner or Line in) */
862 ivtv_audio_set_io(itv); 862 ivtv_audio_set_io(itv);
863 if (itv->hw_flags & IVTV_HW_SAA711X) 863 if (itv->hw_flags & IVTV_HW_SAA711X) {
864 { 864 ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq,
865 struct v4l2_crystal_freq crystal_freq; 865 SAA7115_FREQ_32_11_MHZ, 0);
866 crystal_freq.freq = SAA7115_FREQ_32_11_MHZ;
867 crystal_freq.flags = 0;
868 ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq, &crystal_freq);
869 } 866 }
870 if (atomic_read(&itv->capturing) > 0) { 867 if (atomic_read(&itv->capturing) > 0) {
871 /* Undo video mute */ 868 /* Undo video mute */
@@ -956,10 +953,8 @@ static int ivtv_serialized_open(struct ivtv_stream *s, struct file *filp)
956 /* Select the correct audio input (i.e. radio tuner) */ 953 /* Select the correct audio input (i.e. radio tuner) */
957 ivtv_audio_set_io(itv); 954 ivtv_audio_set_io(itv);
958 if (itv->hw_flags & IVTV_HW_SAA711X) { 955 if (itv->hw_flags & IVTV_HW_SAA711X) {
959 struct v4l2_crystal_freq crystal_freq; 956 ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq,
960 crystal_freq.freq = SAA7115_FREQ_32_11_MHZ; 957 SAA7115_FREQ_32_11_MHZ, SAA7115_FREQ_FL_APLL);
961 crystal_freq.flags = SAA7115_FREQ_FL_APLL;
962 ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq, &crystal_freq);
963 } 958 }
964 /* Done! Unmute and continue. */ 959 /* Done! Unmute and continue. */
965 ivtv_unmute(itv); 960 ivtv_unmute(itv);