aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7115.c
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/saa7115.c
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/saa7115.c')
-rw-r--r--drivers/media/video/saa7115.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index e8488430cdbd..c0e66a88be4f 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1313,17 +1313,16 @@ static int saa711x_s_stream(struct v4l2_subdev *sd, int enable)
1313 return 0; 1313 return 0;
1314} 1314}
1315 1315
1316static int saa711x_s_crystal_freq(struct v4l2_subdev *sd, struct v4l2_crystal_freq *freq) 1316static int saa711x_s_crystal_freq(struct v4l2_subdev *sd, u32 freq, u32 flags)
1317{ 1317{
1318 struct saa711x_state *state = to_state(sd); 1318 struct saa711x_state *state = to_state(sd);
1319 1319
1320 if (freq->freq != SAA7115_FREQ_32_11_MHZ && 1320 if (freq != SAA7115_FREQ_32_11_MHZ && freq != SAA7115_FREQ_24_576_MHZ)
1321 freq->freq != SAA7115_FREQ_24_576_MHZ)
1322 return -EINVAL; 1321 return -EINVAL;
1323 state->crystal_freq = freq->freq; 1322 state->crystal_freq = freq;
1324 state->cgcdiv = (freq->flags & SAA7115_FREQ_FL_CGCDIV) ? 3 : 4; 1323 state->cgcdiv = (flags & SAA7115_FREQ_FL_CGCDIV) ? 3 : 4;
1325 state->ucgc = (freq->flags & SAA7115_FREQ_FL_UCGC) ? 1 : 0; 1324 state->ucgc = (flags & SAA7115_FREQ_FL_UCGC) ? 1 : 0;
1326 state->apll = (freq->flags & SAA7115_FREQ_FL_APLL) ? 1 : 0; 1325 state->apll = (flags & SAA7115_FREQ_FL_APLL) ? 1 : 0;
1327 saa711x_s_clock_freq(sd, state->audclk_freq); 1326 saa711x_s_clock_freq(sd, state->audclk_freq);
1328 return 0; 1327 return 0;
1329} 1328}