git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/pcm-subclass-fix' into for-linus
[pandora-kernel.git]
/
sound
/
soc
/
codecs
/
wm9713.c
diff --git
a/sound/soc/codecs/wm9713.c
b/sound/soc/codecs/wm9713.c
index
a6feb78
..
abed37a
100644
(file)
--- a/
sound/soc/codecs/wm9713.c
+++ b/
sound/soc/codecs/wm9713.c
@@
-710,7
+710,7
@@
static void pll_factors(struct _pll_div *pll_div, unsigned int source)
Ndiv = target / source;
if ((Ndiv < 5) || (Ndiv > 12))
printk(KERN_WARNING
Ndiv = target / source;
if ((Ndiv < 5) || (Ndiv > 12))
printk(KERN_WARNING
- "WM9713 PLL N value %
d
out of recommended range!\n",
+ "WM9713 PLL N value %
u
out of recommended range!\n",
Ndiv);
pll_div->n = Ndiv;
Ndiv);
pll_div->n = Ndiv;
@@
-1040,13
+1040,13
@@
struct snd_soc_dai wm9713_dai[] = {
.channels_min = 1,
.channels_max = 2,
.rates = WM9713_RATES,
.channels_min = 1,
.channels_max = 2,
.rates = WM9713_RATES,
- .formats = SND
RV_PCM_FMTBIT_S16_LE
,},
+ .formats = SND
_SOC_STD_AC97_FMTS
,},
.capture = {
.stream_name = "HiFi Capture",
.channels_min = 1,
.channels_max = 2,
.rates = WM9713_RATES,
.capture = {
.stream_name = "HiFi Capture",
.channels_min = 1,
.channels_max = 2,
.rates = WM9713_RATES,
- .formats = SND
RV_PCM_FMTBIT_S16_LE
,},
+ .formats = SND
_SOC_STD_AC97_FMTS
,},
.ops = &wm9713_dai_ops_hifi,
},
{
.ops = &wm9713_dai_ops_hifi,
},
{
@@
-1056,7
+1056,7
@@
struct snd_soc_dai wm9713_dai[] = {
.channels_min = 1,
.channels_max = 1,
.rates = WM9713_RATES,
.channels_min = 1,
.channels_max = 1,
.rates = WM9713_RATES,
- .formats = SND
RV_PCM_FMTBIT_S16_LE
,},
+ .formats = SND
_SOC_STD_AC97_FMTS
,},
.ops = &wm9713_dai_ops_aux,
},
{
.ops = &wm9713_dai_ops_aux,
},
{