Merge tag 'backlight-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index 0627c56..682e9ed 100644 (file)
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -445,16 +445,16 @@ static int wm8974_pcm_hw_params(struct snd_pcm_substream *substream,
        u16 adn = snd_soc_read(codec, WM8974_ADD) & 0x1f1;
 
        /* 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:
                iface |= 0x0020;
                break;
-       case SNDRV_PCM_FORMAT_S24_LE:
+       case 24:
                iface |= 0x0040;
                break;
-       case SNDRV_PCM_FORMAT_S32_LE:
+       case 32:
                iface |= 0x0060;
                break;
        }