diff options
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 10 | ||||
| -rw-r--r-- | linux/drivers/media/video/msp3400.c | 10 | ||||
| -rw-r--r-- | linux/drivers/media/video/video-buf-dvb.c | 11 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
4 files changed, 33 insertions, 7 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index 137795e03..481ecbe65 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -754,8 +754,14 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout) #endif } } - if (current->flags & PF_FREEZE) - refrigerator(PF_FREEZE); + if (current->flags & PF_FREEZE) { +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12) + refrigerator (PF_FREEZE); +#else + refrigerator (); +#endif + } + remove_wait_queue(&msp->wq, &wait); return msp->restart; } diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c index 137795e03..481ecbe65 100644 --- a/linux/drivers/media/video/msp3400.c +++ b/linux/drivers/media/video/msp3400.c @@ -754,8 +754,14 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout) #endif } } - if (current->flags & PF_FREEZE) - refrigerator(PF_FREEZE); + if (current->flags & PF_FREEZE) { +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12) + refrigerator (PF_FREEZE); +#else + refrigerator (); +#endif + } + remove_wait_queue(&msp->wq, &wait); return msp->restart; } diff --git a/linux/drivers/media/video/video-buf-dvb.c b/linux/drivers/media/video/video-buf-dvb.c index 16a4560d1..1474700d5 100644 --- a/linux/drivers/media/video/video-buf-dvb.c +++ b/linux/drivers/media/video/video-buf-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: video-buf-dvb.c,v 1.9 2005/06/18 04:00:19 mkrufky Exp $ + * $Id: video-buf-dvb.c,v 1.10 2005/07/06 16:21:25 nsh Exp $ * * some helper function for simple DVB cards which simply DMA the * complete transport stream and let the computer sort everything else @@ -62,8 +62,13 @@ static int videobuf_dvb_thread(void *data) break; if (kthread_should_stop()) break; - if (current->flags & PF_FREEZE) - refrigerator(PF_FREEZE); + if (current->flags & PF_FREEZE) { +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12) + refrigerator (PF_FREEZE); +#else + refrigerator (); +#endif + } /* feed buffer data to demux */ if (buf->state == STATE_DONE) diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 8af4b0de4..315eefdbf 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2006-07-06 19:58 nshmyrev + * msp3400.c video-buf-dvb.c: + - Fix build with 2.6.13. + + * cx22702.c: + - Remove unused field id that cause build problems. + + Signed-Off-By: Nickolay V. Shmyrev <nshmyrev@yandex.ru> + 2005-07-06 09:37 mchehab * tuner-core.c: - Cleanup patch at tuner-core.c reverted. Radio is working again. |