summaryrefslogtreecommitdiff
path: root/sound/soc/s3c24xx/smdk_spdif.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-11-26 17:17:42 +0100
committerTakashi Iwai <tiwai@suse.de>2010-11-26 17:17:42 +0100
commit37fa84d8e647e584bf1b71bdff0330049e34f5ef (patch)
tree6575dc8f4771be4677a2810756b1be518db1eb55 /sound/soc/s3c24xx/smdk_spdif.c
parent5a8cfb4e8ae317d283f84122ed20faa069c5e0c4 (diff)
parent25436180ee8bed6740f29d92c2030c759885c147 (diff)
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/s3c24xx/smdk_spdif.c')
-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 f31d22ad7c8..c8bd90488a8 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;