diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 15:09:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 15:09:44 +0100 |
| commit | 9f072b7b2260a588bfb5fb43418c3358104e7c13 (patch) | |
| tree | 055f1082093bb63a34c7bfe43c845567685d4675 /sound/soc/s3c24xx | |
| parent | b1cd6b9ec7c749ddfad628c8c12659591ae195e6 (diff) | |
| parent | 0c31cf3e4af79ea18bbd365b07ef0de207673894 (diff) | |
| download | kernel_samsung_crespo-9f072b7b2260a588bfb5fb43418c3358104e7c13.zip kernel_samsung_crespo-9f072b7b2260a588bfb5fb43418c3358104e7c13.tar.gz kernel_samsung_crespo-9f072b7b2260a588bfb5fb43418c3358104e7c13.tar.bz2 | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/s3c24xx')
| -rw-r--r-- | sound/soc/s3c24xx/s3c-i2s-v2.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 819c3c0..11c45a3 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c @@ -230,6 +230,8 @@ static void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on) pr_debug("%s: IIS: CON=%x MOD=%x FIC=%x\n", __func__, con, mod, fic); } +#define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t) + /* * Wait for the LR signal to allow synchronisation to the L/R clock * from the codec. May only be needed for slave mode. @@ -237,19 +239,21 @@ static void s3c2412_snd_rxctrl(struct s3c_i2sv2_info *i2s, int on) static int s3c2412_snd_lrsync(struct s3c_i2sv2_info *i2s) { u32 iiscon; - unsigned long timeout = jiffies + msecs_to_jiffies(5); + unsigned long loops = msecs_to_loops(5); pr_debug("Entered %s\n", __func__); - while (1) { + while (--loops) { iiscon = readl(i2s->regs + S3C2412_IISCON); if (iiscon & S3C2412_IISCON_LRINDEX) break; - if (timeout < jiffies) { - printk(KERN_ERR "%s: timeout\n", __func__); - return -ETIMEDOUT; - } + cpu_relax(); + } + + if (!loops) { + printk(KERN_ERR "%s: timeout\n", __func__); + return -ETIMEDOUT; } return 0; |