diff options
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/drivers/serial-u16550.c | 3 | ||||
| -rw-r--r-- | sound/soc/s3c24xx/s3c24xx-i2s.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c index 3958dbd..f415601 100644 --- a/sound/drivers/serial-u16550.c +++ b/sound/drivers/serial-u16550.c @@ -43,6 +43,7 @@ #include <sound/initval.h> #include <linux/serial_reg.h> +#include <linux/jiffies.h> #include <asm/io.h> @@ -694,7 +695,7 @@ static void snd_uart16550_output_write(struct snd_rawmidi_substream *substream) (uart->adaptor == SNDRV_SERIAL_SOUNDCANVAS || uart->adaptor == SNDRV_SERIAL_GENERIC) && (uart->prev_out != substream->number || - jiffies-lasttime > 3*HZ)) { + time_after(jiffies, lasttime + 3*HZ))) { if (snd_uart16550_buffer_can_write(uart, 3)) { /* Roland Soundcanvas part selection */ diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index fe30e0d..9d8af3a 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -24,6 +24,7 @@ #include <linux/device.h> #include <linux/delay.h> #include <linux/clk.h> +#include <linux/jiffies.h> #include <sound/driver.h> #include <sound/core.h> #include <sound/pcm.h> @@ -185,7 +186,7 @@ static int s3c24xx_snd_lrsync(void) if (iiscon & S3C2410_IISCON_LRINDEX) break; - if (timeout < jiffies) + if (time_after(jiffies, timeout)) return -ETIMEDOUT; } |