diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-11-07 18:05:22 +0100 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-11-07 18:05:22 +0100 |
| commit | 0ad3a96f8ad910ecf87a25ec69ed360b284dee2e (patch) | |
| tree | 12d292fd58fc0f7a3eb56c89dfc23569f3ab6c00 /drivers/media/video/saa7134 | |
| parent | [IA64] restrict CONFIG_SGI_SN_XP to IA64_GENERIC or IA64_SGI_SN2 (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial (diff) | |
| download | linux-0ad3a96f8ad910ecf87a25ec69ed360b284dee2e.tar.xz linux-0ad3a96f8ad910ecf87a25ec69ed360b284dee2e.zip | |
Auto-update from upstream
Diffstat (limited to 'drivers/media/video/saa7134')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-tvaudio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c index badf2f9e3072..61a2d6b50eef 100644 --- a/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/drivers/media/video/saa7134/saa7134-tvaudio.c @@ -342,8 +342,8 @@ static int tvaudio_sleep(struct saa7134_dev *dev, int timeout) set_current_state(TASK_INTERRUPTIBLE); schedule(); } else { - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(msecs_to_jiffies(timeout)); + schedule_timeout_interruptible + (msecs_to_jiffies(timeout)); } } remove_wait_queue(&dev->thread.wq, &wait); |