diff options
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-tvaudio.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-tvaudio.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c index 682c79857..0b911e8d8 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.14 2004/10/13 10:39:00 kraxel Exp $ + * $Id: saa7134-tvaudio.c,v 1.15 2004/10/15 10:29:24 kraxel Exp $ * * device driver for philips saa7134 based TV cards * tv audio decoder (fm stereo, nicam, ...) @@ -330,8 +330,15 @@ static int tvaudio_sleep(struct saa7134_dev *dev, int timeout) if (timeout < 0) { set_current_state(TASK_INTERRUPTIBLE); schedule(); - } else + } else { +#if 0 + /* hmm, that one doesn't return on wakeup ... */ msleep_interruptible(timeout); +#else + set_current_state(TASK_INTERRUPTIBLE); + schedule_timeout(msecs_to_jiffies(timeout)); +#endif + } } remove_wait_queue(&dev->thread.wq, &wait); return dev->thread.scan1 != dev->thread.scan2; |