From 69e64bd524e956849f57ff70800f53827af14dc7 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 28 Mar 2006 18:32:52 -0300 Subject: [PATCH] --- yaml --- r: 25160 b: refs/heads/master c: dc555aa63c798af097f5c303bcf72a8390b03da5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/msp3400-driver.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6fa084bf3d67..51c4f9e3efda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75c4570ca4849b089c4edfc14bf02b4720087aba +refs/heads/master: dc555aa63c798af097f5c303bcf72a8390b03da5 diff --git a/trunk/drivers/media/video/msp3400-driver.c b/trunk/drivers/media/video/msp3400-driver.c index c40e8ba9a2ea..12a83ec7872c 100644 --- a/trunk/drivers/media/video/msp3400-driver.c +++ b/trunk/drivers/media/video/msp3400-driver.c @@ -279,7 +279,8 @@ void msp_set_scart(struct i2c_client *client, int in, int out) msp_write_dsp(client, 0x13, state->acb); /* Sets I2S speed 0 = 1.024 Mbps, 1 = 2.048 Mbps */ - msp_write_dem(client, 0x40, state->i2s_mode); + if (state->has_i2s_conf) + msp_write_dem(client, 0x40, state->i2s_mode); } void msp_set_mute(struct i2c_client *client)