diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2006-02-02 07:56:54 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 10:28:15 +0100 |
| commit | e957ebf164e880ddb0c057418195db47d013c4ac (patch) | |
| tree | 63f4315f81246869a8eb0da48be4c33315cdb7aa /sound/i2c | |
| parent | 2ba8c15c738b64b4d3acaace1e19750362ff2b69 (diff) | |
| download | linux-3.10-e957ebf164e880ddb0c057418195db47d013c4ac.tar.gz linux-3.10-e957ebf164e880ddb0c057418195db47d013c4ac.tar.bz2 linux-3.10-e957ebf164e880ddb0c057418195db47d013c4ac.zip | |
[ALSA] ice1712 & cs8427 - fix problem for S/PDIF input setup
Modules: I2C cs8427,ICE1712 driver
See ALSA bug#1785 for more details.
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/i2c')
| -rw-r--r-- | sound/i2c/cs8427.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c index 9deba80a587..cb89f7eb923 100644 --- a/sound/i2c/cs8427.c +++ b/sound/i2c/cs8427.c @@ -291,11 +291,13 @@ static void snd_cs8427_reset(struct snd_i2c_device *cs8427) { struct cs8427 *chip; unsigned long end_time; - int data; + int data, aes3input = 0; snd_assert(cs8427, return); chip = cs8427->private_data; snd_i2c_lock(cs8427->bus); + if ((chip->regmap[CS8427_REG_CLOCKSOURCE] & CS8427_RXDAES3INPUT) == CS8427_RXDAES3INPUT) /* AES3 bit is set */ + aes3input = 1; chip->regmap[CS8427_REG_CLOCKSOURCE] &= ~(CS8427_RUN | CS8427_RXDMASK); snd_cs8427_reg_write(cs8427, CS8427_REG_CLOCKSOURCE, chip->regmap[CS8427_REG_CLOCKSOURCE]); @@ -316,7 +318,8 @@ static void snd_cs8427_reset(struct snd_i2c_device *cs8427) } snd_i2c_lock(cs8427->bus); chip->regmap[CS8427_REG_CLOCKSOURCE] &= ~CS8427_RXDMASK; - chip->regmap[CS8427_REG_CLOCKSOURCE] |= CS8427_RXDAES3INPUT; + if (aes3input) + chip->regmap[CS8427_REG_CLOCKSOURCE] |= CS8427_RXDAES3INPUT; snd_cs8427_reg_write(cs8427, CS8427_REG_CLOCKSOURCE, chip->regmap[CS8427_REG_CLOCKSOURCE]); snd_i2c_unlock(cs8427->bus); |