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

[linux-2.6-microblaze.git] / sound / soc / codecs / tas5086.c

diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c
index be7194b..249ef5c 100644 (file)
--- a/sound/soc/codecs/tas5086.c
+++ b/sound/soc/codecs/tas5086.c
@@ -425,14 +425,14 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream,
        }
 
        /* ... then add the offset for the sample bit depth. */
-       switch (params_format(params)) {
-        case SNDRV_PCM_FORMAT_S16_LE:
+       switch (params_width(params)) {
+        case 16:
                val += 0;
                 break;
-       case SNDRV_PCM_FORMAT_S20_3LE:
+       case 20:
                val += 1;
                break;
-       case SNDRV_PCM_FORMAT_S24_3LE:
+       case 24:
                val += 2;
                break;
        default: