From ee00178882ec47730e5d8f651135e482fa6f0cce Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Tue, 13 Sep 2005 20:11:39 +0000 Subject: * bt832.c: (bt832_probe): * bttv-i2c.c: (attach_inform): * cx88-i2c.c: (attach_inform), (detach_inform): * id.h: * ir-kbd-i2c.c: (ir_probe): * msp3400.c: (msp34xx_sleep), (msp_attach): * saa6588.c: * saa6752hs.c: * saa7134-i2c.c: (attach_inform): * saa7134-tvaudio.c: (tvaudio_sleep): * tda7432.c: (tda7432_probe): * tda9875.c: (tda9875_probe): * tda9887.c: (tda9887_probe): * tuner-core.c: * tveeprom.c: (tveeprom_attach_adapter): * tvmixer.c: (tvmixer_ioctl), (tvmixer_clients), (tvmixer_cleanup_module): * video-buf.c: (videobuf_dma_free): - Step two, in preparation for 2.6.14-rcX compatability: - Compile tested against vanila kernels 2.6.13 & 2.6.8 - 2.6.14 compile still broken... Signed-off-by: Michael Krufky --- linux/drivers/media/video/saa7134/saa7134-tvaudio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'linux/drivers/media/video/saa7134/saa7134-tvaudio.c') diff --git a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c index 1c84be284..0ce93ad34 100644 --- a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-tvaudio.c,v 1.31 2005/07/15 21:44:14 mchehab Exp $ + * $Id: saa7134-tvaudio.c,v 1.32 2005/09/13 20:11:39 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * tv audio decoder (fm stereo, nicam, ...) @@ -344,9 +344,9 @@ static int tvaudio_sleep(struct saa7134_dev *dev, int timeout) set_current_state(TASK_INTERRUPTIBLE); schedule(); } else { -#if 0 - /* hmm, that one doesn't return on wakeup ... */ - msleep_interruptible(timeout); +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) + schedule_timeout_interruptible + (msecs_to_jiffies(timeout)); #else set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(msecs_to_jiffies(timeout)); -- cgit v1.2.3