diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 21:57:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 21:57:54 +0100 |
| commit | 46758dee727348d3648c83445d10ded321376543 (patch) | |
| tree | 3c0649b6150901d1d480b3c3a84c45341b09ce2d /sound/soc/codecs/ad1836.c | |
| parent | f97d0c6d5f947a96a6d3957eff3da6d9ca246e54 (diff) | |
| parent | 8ca695f273709a9d147826716a8dee3e0eb2407f (diff) | |
| download | blackbird-op-linux-46758dee727348d3648c83445d10ded321376543.tar.gz blackbird-op-linux-46758dee727348d3648c83445d10ded321376543.zip | |
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound/soc/codecs/ad1836.c')
| -rw-r--r-- | sound/soc/codecs/ad1836.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c index 4390d4630de5..1e9a801176d5 100644 --- a/sound/soc/codecs/ad1836.c +++ b/sound/soc/codecs/ad1836.c @@ -178,22 +178,22 @@ static int ad1836_hw_params(struct snd_pcm_substream *substream, /* bit size */ switch (params_format(params)) { case SNDRV_PCM_FORMAT_S16_LE: - word_len = 3; + word_len = AD1836_WORD_LEN_16; break; case SNDRV_PCM_FORMAT_S20_3LE: - word_len = 1; + word_len = AD1836_WORD_LEN_20; break; case SNDRV_PCM_FORMAT_S24_LE: case SNDRV_PCM_FORMAT_S32_LE: - word_len = 0; + word_len = AD1836_WORD_LEN_24; break; } - snd_soc_update_bits(codec, AD1836_DAC_CTRL1, - AD1836_DAC_WORD_LEN_MASK, word_len); + snd_soc_update_bits(codec, AD1836_DAC_CTRL1, AD1836_DAC_WORD_LEN_MASK, + word_len << AD1836_DAC_WORD_LEN_OFFSET); - snd_soc_update_bits(codec, AD1836_ADC_CTRL2, - AD1836_ADC_WORD_LEN_MASK, word_len); + snd_soc_update_bits(codec, AD1836_ADC_CTRL2, AD1836_ADC_WORD_LEN_MASK, + word_len << AD1836_ADC_WORD_OFFSET); return 0; } |
