diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-22 15:33:12 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-22 15:33:12 -0500 |
| commit | cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e (patch) | |
| tree | a7183a2c7caf5249bd355c55f5956a948defaac6 /sound/soc/s3c24xx | |
| parent | c7b642911ea0fa9168425757752f094a1255209a (diff) | |
| parent | eba19fdd818dfec3782ff095591e51c9bd617403 (diff) | |
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.c | 4 |
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) | |||
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | mout_epll = clk_get(NULL, "mout_epll"); | 40 | mout_epll = clk_get(NULL, "mout_epll"); |
| 41 | if (IS_ERR(fout_epll)) { | 41 | if (IS_ERR(mout_epll)) { |
| 42 | printk(KERN_WARNING "%s: Cannot find mout_epll.\n", | 42 | printk(KERN_WARNING "%s: Cannot find mout_epll.\n", |
| 43 | __func__); | 43 | __func__); |
| 44 | ret = -EINVAL; | 44 | ret = -EINVAL; |
| @@ -54,7 +54,7 @@ static int set_audio_clock_heirachy(struct platform_device *pdev) | |||
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | sclk_spdif = clk_get(NULL, "sclk_spdif"); | 56 | sclk_spdif = clk_get(NULL, "sclk_spdif"); |
| 57 | if (IS_ERR(fout_epll)) { | 57 | if (IS_ERR(sclk_spdif)) { |
| 58 | printk(KERN_WARNING "%s: Cannot find sclk_spdif.\n", | 58 | printk(KERN_WARNING "%s: Cannot find sclk_spdif.\n", |
| 59 | __func__); | 59 | __func__); |
| 60 | ret = -EINVAL; | 60 | ret = -EINVAL; |