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

[sfrench/cifs-2.6.git] / sound / soc / codecs / twl4030.c

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index cf404505e7d1b01a18681d334c7be857a17530ad..b6b0cb39959979f783bcaa5864c80ebe864d4142 100644 (file)
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -1763,16 +1763,16 @@ static int twl4030_hw_params(struct snd_pcm_substream *substream,
        old_format = twl4030_read(codec, TWL4030_REG_AUDIO_IF);
        format = old_format;
        format &= ~TWL4030_DATA_WIDTH;
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S16_LE:
+       switch (params_width(params)) {
+       case 16:
                format |= TWL4030_DATA_WIDTH_16S_16W;
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                format |= TWL4030_DATA_WIDTH_32S_24W;
                break;
        default:
-               dev_err(codec->dev, "%s: unknown format %d\n", __func__,
-                       params_format(params));
+               dev_err(codec->dev, "%s: unsupported bits/sample %d\n",
+                       __func__, params_width(params));
                return -EINVAL;
        }