diff options
Diffstat (limited to 'sound/soc/codecs/cs42l51.c')
-rw-r--r-- | sound/soc/codecs/cs42l51.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index a8bf588e8740..091d0193f507 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c | |||
@@ -141,15 +141,15 @@ static const struct soc_enum cs42l51_chan_mix = | |||
141 | static const struct snd_kcontrol_new cs42l51_snd_controls[] = { | 141 | static const struct snd_kcontrol_new cs42l51_snd_controls[] = { |
142 | SOC_DOUBLE_R_SX_TLV("PCM Playback Volume", | 142 | SOC_DOUBLE_R_SX_TLV("PCM Playback Volume", |
143 | CS42L51_PCMA_VOL, CS42L51_PCMB_VOL, | 143 | CS42L51_PCMA_VOL, CS42L51_PCMB_VOL, |
144 | 7, 0xffffff99, 0x18, adc_pcm_tlv), | 144 | 6, 0x19, 0x7F, adc_pcm_tlv), |
145 | SOC_DOUBLE_R("PCM Playback Switch", | 145 | SOC_DOUBLE_R("PCM Playback Switch", |
146 | CS42L51_PCMA_VOL, CS42L51_PCMB_VOL, 7, 1, 1), | 146 | CS42L51_PCMA_VOL, CS42L51_PCMB_VOL, 7, 1, 1), |
147 | SOC_DOUBLE_R_SX_TLV("Analog Playback Volume", | 147 | SOC_DOUBLE_R_SX_TLV("Analog Playback Volume", |
148 | CS42L51_AOUTA_VOL, CS42L51_AOUTB_VOL, | 148 | CS42L51_AOUTA_VOL, CS42L51_AOUTB_VOL, |
149 | 8, 0xffffff19, 0x18, aout_tlv), | 149 | 0, 0x34, 0xE4, aout_tlv), |
150 | SOC_DOUBLE_R_SX_TLV("ADC Mixer Volume", | 150 | SOC_DOUBLE_R_SX_TLV("ADC Mixer Volume", |
151 | CS42L51_ADCA_VOL, CS42L51_ADCB_VOL, | 151 | CS42L51_ADCA_VOL, CS42L51_ADCB_VOL, |
152 | 7, 0xffffff99, 0x18, adc_pcm_tlv), | 152 | 6, 0x19, 0x7F, adc_pcm_tlv), |
153 | SOC_DOUBLE_R("ADC Mixer Switch", | 153 | SOC_DOUBLE_R("ADC Mixer Switch", |
154 | CS42L51_ADCA_VOL, CS42L51_ADCB_VOL, 7, 1, 1), | 154 | CS42L51_ADCA_VOL, CS42L51_ADCB_VOL, 7, 1, 1), |
155 | SOC_SINGLE("Playback Deemphasis Switch", CS42L51_DAC_CTL, 3, 1, 0), | 155 | SOC_SINGLE("Playback Deemphasis Switch", CS42L51_DAC_CTL, 3, 1, 0), |
@@ -356,8 +356,7 @@ static int cs42l51_hw_params(struct snd_pcm_substream *substream, | |||
356 | struct snd_pcm_hw_params *params, | 356 | struct snd_pcm_hw_params *params, |
357 | struct snd_soc_dai *dai) | 357 | struct snd_soc_dai *dai) |
358 | { | 358 | { |
359 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 359 | struct snd_soc_codec *codec = dai->codec; |
360 | struct snd_soc_codec *codec = rtd->codec; | ||
361 | struct cs42l51_private *cs42l51 = snd_soc_codec_get_drvdata(codec); | 360 | struct cs42l51_private *cs42l51 = snd_soc_codec_get_drvdata(codec); |
362 | int ret; | 361 | int ret; |
363 | unsigned int i; | 362 | unsigned int i; |