diff options
author | 2009-11-06 15:46:18 +0000 | |
---|---|---|
committer | 2009-11-06 15:46:18 +0000 | |
commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /sound/soc/s3c24xx/s3c64xx-i2s.c | |
parent | ASoC: Factor out snd_soc_init_card() (diff) | |
parent | ASoC: S3C64XX I2S: Enable audio-bus clock (diff) | |
download | linux-dev-330f28f691e9b349e34adcaf82b273cf061bb491.tar.xz linux-dev-330f28f691e9b349e34adcaf82b273cf061bb491.zip |
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) goto err; } + clk_enable(i2s->iis_cclk); + ret = s3c_i2sv2_probe(pdev, dai, i2s, 0); if (ret) goto err_clk; |