diff options
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 9 | ||||
| -rw-r--r-- | linux/drivers/media/video/msp3400.c | 9 | ||||
| -rw-r--r-- | linux/drivers/media/video/tvaudio.c | 4 | ||||
| -rw-r--r-- | v4l/ChangeLog | 11 |
4 files changed, 25 insertions, 8 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index 702268d6a..97440f099 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -755,15 +755,16 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout) #endif } } - if (current->flags & PF_FREEZE) { #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12) + if (current->flags & PF_FREEZE) { refrigerator (PF_FREEZE); -#else - refrigerator (); -#endif } +#endif remove_wait_queue(&msp->wq, &wait); +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) + try_to_freeze(); +#endif return msp->restart; } diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c index 702268d6a..97440f099 100644 --- a/linux/drivers/media/video/msp3400.c +++ b/linux/drivers/media/video/msp3400.c @@ -755,15 +755,16 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout) #endif } } - if (current->flags & PF_FREEZE) { #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12) + if (current->flags & PF_FREEZE) { refrigerator (PF_FREEZE); -#else - refrigerator (); -#endif } +#endif remove_wait_queue(&msp->wq, &wait); +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) + try_to_freeze(); +#endif return msp->restart; } diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c index 283726ce5..ca4195de0 100644 --- a/linux/drivers/media/video/tvaudio.c +++ b/linux/drivers/media/video/tvaudio.c @@ -303,6 +303,10 @@ static int chip_thread(void *data) schedule(); } remove_wait_queue(&chip->wq, &wait); +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) + try_to_freeze(); +#endif + if (chip->done || signal_pending(current)) break; dprintk("%s: thread wakeup\n", i2c_clientname(&chip->c)); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 05b349268..e768b624f 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2005-07-25 17:29 mchehab + + * msp3400.c: + - try_to_freeze moved to the right place. + * tvaudio.c: + - Tvaudio lacks a refrigerator call. This patch fixes that. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + Signed-off-by: Nigel Cunningham <ncunningham@suspend2.net> + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-07-25 05:12 mkrufky * cx88-dvb.c, cx88-i2c.c, Makefile: - Undo accidental change in previous commit. |