aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/drivers/serial-u16550.c3
-rw-r--r--sound/soc/s3c24xx/s3c24xx-i2s.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index 3958dbd626b2..f4156011945f 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -43,6 +43,7 @@
43#include <sound/initval.h> 43#include <sound/initval.h>
44 44
45#include <linux/serial_reg.h> 45#include <linux/serial_reg.h>
46#include <linux/jiffies.h>
46 47
47#include <asm/io.h> 48#include <asm/io.h>
48 49
@@ -694,7 +695,7 @@ static void snd_uart16550_output_write(struct snd_rawmidi_substream *substream)
694 (uart->adaptor == SNDRV_SERIAL_SOUNDCANVAS || 695 (uart->adaptor == SNDRV_SERIAL_SOUNDCANVAS ||
695 uart->adaptor == SNDRV_SERIAL_GENERIC) && 696 uart->adaptor == SNDRV_SERIAL_GENERIC) &&
696 (uart->prev_out != substream->number || 697 (uart->prev_out != substream->number ||
697 jiffies-lasttime > 3*HZ)) { 698 time_after(jiffies, lasttime + 3*HZ))) {
698 699
699 if (snd_uart16550_buffer_can_write(uart, 3)) { 700 if (snd_uart16550_buffer_can_write(uart, 3)) {
700 /* Roland Soundcanvas part selection */ 701 /* Roland Soundcanvas part selection */
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
index fe30e0d82d37..9d8af3a46da8 100644
--- a/sound/soc/s3c24xx/s3c24xx-i2s.c
+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
@@ -24,6 +24,7 @@
24#include <linux/device.h> 24#include <linux/device.h>
25#include <linux/delay.h> 25#include <linux/delay.h>
26#include <linux/clk.h> 26#include <linux/clk.h>
27#include <linux/jiffies.h>
27#include <sound/driver.h> 28#include <sound/driver.h>
28#include <sound/core.h> 29#include <sound/core.h>
29#include <sound/pcm.h> 30#include <sound/pcm.h>
@@ -185,7 +186,7 @@ static int s3c24xx_snd_lrsync(void)
185 if (iiscon & S3C2410_IISCON_LRINDEX) 186 if (iiscon & S3C2410_IISCON_LRINDEX)
186 break; 187 break;
187 188
188 if (timeout < jiffies) 189 if (time_after(jiffies, timeout))
189 return -ETIMEDOUT; 190 return -ETIMEDOUT;
190 } 191 }
191 192