diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /sound/soc/s3c24xx/s3c64xx-i2s.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/s3c24xx/s3c64xx-i2s.c')
| -rw-r--r-- | sound/soc/s3c24xx/s3c64xx-i2s.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index b67eed59666a..d68cae15561c 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c | |||
| @@ -236,6 +236,8 @@ static __devinit int s3c64xx_iis_dev_probe(struct platform_device *pdev) | |||
| 236 | goto err; | 236 | goto err; |
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | clk_enable(i2s->iis_cclk); | ||
| 240 | |||
| 239 | ret = s3c_i2sv2_probe(pdev, dai, i2s, 0); | 241 | ret = s3c_i2sv2_probe(pdev, dai, i2s, 0); |
| 240 | if (ret) | 242 | if (ret) |
| 241 | goto err_clk; | 243 | goto err_clk; |