summaryrefslogtreecommitdiff
path: root/sound/soc/s3c24xx
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-22 23:33:12 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-22 23:33:12 +0300
commitcbe80def41f2f12b1b4f8b5c4eb048d50d842d6e (patch)
treea7183a2c7caf5249bd355c55f5956a948defaac6 /sound/soc/s3c24xx
parentc7b642911ea0fa9168425757752f094a1255209a (diff)
parenteba19fdd818dfec3782ff095591e51c9bd617403 (diff)
downloadlinux-cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e.tar.xz
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/s3c24xx')
-rw-r--r--sound/soc/s3c24xx/smdk_spdif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/s3c24xx/smdk_spdif.c b/sound/soc/s3c24xx/smdk_spdif.c
index f31d22ad7c88..c8bd90488a87 100644
--- a/sound/soc/s3c24xx/smdk_spdif.c
+++ b/sound/soc/s3c24xx/smdk_spdif.c
@@ -38,7 +38,7 @@ static int set_audio_clock_heirachy(struct platform_device *pdev)
}
mout_epll = clk_get(NULL, "mout_epll");
- if (IS_ERR(fout_epll)) {
+ if (IS_ERR(mout_epll)) {
printk(KERN_WARNING "%s: Cannot find mout_epll.\n",
__func__);
ret = -EINVAL;
@@ -54,7 +54,7 @@ static int set_audio_clock_heirachy(struct platform_device *pdev)
}
sclk_spdif = clk_get(NULL, "sclk_spdif");
- if (IS_ERR(fout_epll)) {
+ if (IS_ERR(sclk_spdif)) {
printk(KERN_WARNING "%s: Cannot find sclk_spdif.\n",
__func__);
ret = -EINVAL;