Merge tag 'omap-for-v3.17/soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / sound / soc / codecs / wm8400.c

diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index 06e913d..72471be 100644 (file)
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -1095,16 +1095,16 @@ static int wm8400_hw_params(struct snd_pcm_substream *substream,
 
        audio1 &= ~WM8400_AIF_WL_MASK;
        /* bit size */
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S16_LE:
+       switch (params_width(params)) {
+       case 16:
                break;
-       case SNDRV_PCM_FORMAT_S20_3LE:
+       case 20:
                audio1 |= WM8400_AIF_WL_20BITS;
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                audio1 |= WM8400_AIF_WL_24BITS;
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                audio1 |= WM8400_AIF_WL_32BITS;
                break;
        }