diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:43:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:43:09 -0400 |
| commit | a7144b23da073f4b3192e356ad74de12aba60e00 (patch) | |
| tree | 2b93bdf54563bfe447a167d832c43d24f56c7a95 /drivers/media/video/msp3400.c | |
| parent | 8a60a07129fad60bba779a2a4038c7518b167fc7 (diff) | |
| parent | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff) | |
| download | linux-a7144b23da073f4b3192e356ad74de12aba60e00.tar.gz linux-a7144b23da073f4b3192e356ad74de12aba60e00.tar.bz2 linux-a7144b23da073f4b3192e356ad74de12aba60e00.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/media/video/msp3400.c')
| -rw-r--r-- | drivers/media/video/msp3400.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c index 6239254db27e..62f1b8ddb98b 100644 --- a/drivers/media/video/msp3400.c +++ b/drivers/media/video/msp3400.c @@ -741,11 +741,9 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout) schedule_timeout(msecs_to_jiffies(timeout)); } } - if (current->flags & PF_FREEZE) { - refrigerator (); - } remove_wait_queue(&msp->wq, &wait); + try_to_freeze(); return msp->restart; } |