Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/width', 'asoc...

[uclinux-h8/linux.git] / sound / soc / codecs / wm8962.c

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index eac2903..1098ae3 100644 (file)
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -2587,16 +2587,16 @@ static int wm8962_hw_params(struct snd_pcm_substream *substream,
        if (wm8962->lrclk % 8000 == 0)
                adctl3 |= WM8962_SAMPLE_RATE_INT_MODE;
 
-       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:
                aif0 |= 0x4;
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                aif0 |= 0x8;
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                aif0 |= 0xc;
                break;
        default: