diff options
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/davinci/davinci-sffsdr.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/neo1973_wm8753.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c-dma.c | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c index 997c54f3693c..009b6521a1bf 100644 --- a/sound/soc/davinci/davinci-sffsdr.c +++ b/sound/soc/davinci/davinci-sffsdr.c | |||
@@ -152,7 +152,7 @@ static int __init sffsdr_init(void) | |||
152 | sffsdr_snd_resources, | 152 | sffsdr_snd_resources, |
153 | ARRAY_SIZE(sffsdr_snd_resources)); | 153 | ARRAY_SIZE(sffsdr_snd_resources)); |
154 | if (ret) { | 154 | if (ret) { |
155 | printk(KERN_ERR "platform device add ressources failed\n"); | 155 | printk(KERN_ERR "platform device add resources failed\n"); |
156 | goto error; | 156 | goto error; |
157 | } | 157 | } |
158 | 158 | ||
diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c index c457bfd8297c..e97bdf150a03 100644 --- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c | |||
@@ -182,7 +182,7 @@ static int neo1973_gta02_voice_hw_params( | |||
182 | if (ret < 0) | 182 | if (ret < 0) |
183 | return ret; | 183 | return ret; |
184 | 184 | ||
185 | /* configue and enable PLL for 12.288MHz output */ | 185 | /* configure and enable PLL for 12.288MHz output */ |
186 | ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, | 186 | ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, |
187 | iis_clkrate / 4, 12288000); | 187 | iis_clkrate / 4, 12288000); |
188 | if (ret < 0) | 188 | if (ret < 0) |
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index d7a39a0fe99b..f4f2ee731f01 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c | |||
@@ -201,7 +201,7 @@ static int neo1973_voice_hw_params(struct snd_pcm_substream *substream, | |||
201 | if (ret < 0) | 201 | if (ret < 0) |
202 | return ret; | 202 | return ret; |
203 | 203 | ||
204 | /* configue and enable PLL for 12.288MHz output */ | 204 | /* configure and enable PLL for 12.288MHz output */ |
205 | ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, | 205 | ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, |
206 | iis_clkrate / 4, 12288000); | 206 | iis_clkrate / 4, 12288000); |
207 | if (ret < 0) | 207 | if (ret < 0) |
diff --git a/sound/soc/s3c24xx/s3c-dma.c b/sound/soc/s3c24xx/s3c-dma.c index 54bff83c98b4..243f79bf43bb 100644 --- a/sound/soc/s3c24xx/s3c-dma.c +++ b/sound/soc/s3c24xx/s3c-dma.c | |||
@@ -94,8 +94,7 @@ static void s3c_dma_enqueue(struct snd_pcm_substream *substream) | |||
94 | 94 | ||
95 | if ((pos + len) > prtd->dma_end) { | 95 | if ((pos + len) > prtd->dma_end) { |
96 | len = prtd->dma_end - pos; | 96 | len = prtd->dma_end - pos; |
97 | pr_debug(KERN_DEBUG "%s: corrected dma len %ld\n", | 97 | pr_debug("%s: corrected dma len %ld\n", __func__, len); |
98 | __func__, len); | ||
99 | } | 98 | } |
100 | 99 | ||
101 | ret = s3c2410_dma_enqueue(prtd->params->channel, | 100 | ret = s3c2410_dma_enqueue(prtd->params->channel, |