projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-tools'
[linux-2.6-block.git]
/
sound
/
soc
/
codecs
/
wm8400.c
diff --git
a/sound/soc/codecs/wm8400.c
b/sound/soc/codecs/wm8400.c
index 06e913d3fea15bbfb231fb87b46ee8571e0c7ea8..72471bef2e9a592da98fbea3f3a5db08471d39a2 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 */
audio1 &= ~WM8400_AIF_WL_MASK;
/* bit size */
- switch (params_
format
(params)) {
- case
SNDRV_PCM_FORMAT_S16_LE
:
+ switch (params_
width
(params)) {
+ case
16
:
break;
break;
- case
SNDRV_PCM_FORMAT_S20_3LE
:
+ case
20
:
audio1 |= WM8400_AIF_WL_20BITS;
break;
audio1 |= WM8400_AIF_WL_20BITS;
break;
- case
SNDRV_PCM_FORMAT_S24_LE
:
+ case
24
:
audio1 |= WM8400_AIF_WL_24BITS;
break;
audio1 |= WM8400_AIF_WL_24BITS;
break;
- case
SNDRV_PCM_FORMAT_S32_LE
:
+ case
32
:
audio1 |= WM8400_AIF_WL_32BITS;
break;
}
audio1 |= WM8400_AIF_WL_32BITS;
break;
}