diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-20 10:20:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-20 10:20:14 +0100 |
| commit | 258753361534a40ad7180c742da813fc659e427b (patch) | |
| tree | 58517f6ce46ab2c897d427b7d1bf29850be314fa /sound/soc/codecs/alc5632.c | |
| parent | 315fba80a664e4bd928e0b85a38d26e60645b96a (diff) | |
| parent | 2aff4c9ce898b9079658650c1ab33c44b100a203 (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/codecs/alc5632.c')
| -rw-r--r-- | sound/soc/codecs/alc5632.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c index 19e9f222d09c..fb001c56cf8d 100644 --- a/sound/soc/codecs/alc5632.c +++ b/sound/soc/codecs/alc5632.c @@ -869,14 +869,14 @@ static int alc5632_pcm_hw_params(struct snd_pcm_substream *substream, iface &= ~ALC5632_DAI_I2S_DL_MASK; /* bit size */ - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S16_LE: + switch (params_width(params)) { + case 16: iface |= ALC5632_DAI_I2S_DL_16; break; - case SNDRV_PCM_FORMAT_S20_3LE: + case 20: iface |= ALC5632_DAI_I2S_DL_20; break; - case SNDRV_PCM_FORMAT_S24_LE: + case 24: iface |= ALC5632_DAI_I2S_DL_24; break; default: |