diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 09:20:26 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 09:20:26 +0300 |
| commit | c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83 (patch) | |
| tree | 1185ddc2c4cea1c4da09d6b83893f91aefe7cd3d /drivers/media/video/msp3400.c | |
| parent | 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (diff) | |
| parent | 8e8b77dd4846b73f2e0756cf59123ee709246d11 (diff) | |
| download | linux-c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83.tar.xz | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/media/video/msp3400.c')
| -rw-r--r-- | drivers/media/video/msp3400.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c index 262890cb20a7..e75e7948fd9d 100644 --- a/drivers/media/video/msp3400.c +++ b/drivers/media/video/msp3400.c @@ -741,8 +741,8 @@ static int msp34xx_sleep(struct msp3400c *msp, 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)); } } |