summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-08-30 17:50:53 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-08-30 17:50:53 -0300
commitd6f73b4d182eb4a2f57fb9c11f66ee2226f07391 (patch)
tree3bd3acfbbc317b7c313ece23ab6b47f454e7c7b2 /linux
parent71f8f83c1e99eb2701eea8bdf0ceae8d7196a850 (diff)
downloadmediapointer-dvb-s2-d6f73b4d182eb4a2f57fb9c11f66ee2226f07391.tar.gz
mediapointer-dvb-s2-d6f73b4d182eb4a2f57fb9c11f66ee2226f07391.tar.bz2
Fix: standard need to be setted, before adjusting audio
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/saa7115.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c
index c1cf58652..2259d318a 100644
--- a/linux/drivers/media/video/saa7115.c
+++ b/linux/drivers/media/video/saa7115.c
@@ -861,6 +861,8 @@ static void saa711x_set_v4lstd(struct i2c_client *client, v4l2_std_id std)
011 NTSC N (3.58MHz) PAL M (3.58MHz)
100 reserved NTSC-Japan (3.58MHz)
*/
+ state->std = std;
+
if (state->ident == V4L2_IDENT_SAA7111 ||
state->ident == V4L2_IDENT_SAA7113) {
u8 reg = saa711x_read(client, R_0E_CHROMA_CNTL_1) & 0x8f;
@@ -886,8 +888,6 @@ static void saa711x_set_v4lstd(struct i2c_client *client, v4l2_std_id std)
/* switch audio mode too! */
saa711x_set_audio_clock_freq(client, state->audclk_freq);
}
-
- state->std = std;
}
static v4l2_std_id saa711x_get_v4lstd(struct i2c_client *client)