diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 20:16:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 20:16:53 -0400 |
| commit | 2031d0f586839bc68f35bcf8580b18947f8491d4 (patch) | |
| tree | e317615b4cb62350edeea0afe0a4fc94152cee29 /drivers/media/video | |
| parent | 98e7f29418a4931f97e6b78d1ef3a47103fe6cd5 (diff) | |
| parent | 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 (diff) | |
Merge Christoph's freeze cleanup patch
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/msp3400.c | 3 | ||||
| -rw-r--r-- | drivers/media/video/video-buf-dvb.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c index 1b7d38e96f14..b4ee9dfe6d42 100644 --- a/drivers/media/video/msp3400.c +++ b/drivers/media/video/msp3400.c | |||
| @@ -750,8 +750,7 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout) | |||
| 750 | #endif | 750 | #endif |
| 751 | } | 751 | } |
| 752 | } | 752 | } |
| 753 | if (current->flags & PF_FREEZE) | 753 | try_to_freeze(); |
| 754 | refrigerator(PF_FREEZE); | ||
| 755 | remove_wait_queue(&msp->wq, &wait); | 754 | remove_wait_queue(&msp->wq, &wait); |
| 756 | return msp->restart; | 755 | return msp->restart; |
| 757 | } | 756 | } |
diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c index 5f870075b55e..15f5bb486963 100644 --- a/drivers/media/video/video-buf-dvb.c +++ b/drivers/media/video/video-buf-dvb.c | |||
| @@ -62,8 +62,7 @@ static int videobuf_dvb_thread(void *data) | |||
| 62 | break; | 62 | break; |
| 63 | if (kthread_should_stop()) | 63 | if (kthread_should_stop()) |
| 64 | break; | 64 | break; |
| 65 | if (current->flags & PF_FREEZE) | 65 | try_to_freeze(); |
| 66 | refrigerator(PF_FREEZE); | ||
| 67 | 66 | ||
| 68 | /* feed buffer data to demux */ | 67 | /* feed buffer data to demux */ |
| 69 | if (buf->state == STATE_DONE) | 68 | if (buf->state == STATE_DONE) |