diff options
-rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 10 | ||||
-rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 2 | ||||
-rw-r--r-- | linux/drivers/media/video/msp3400.c | 2 | ||||
-rw-r--r-- | v4l/ChangeLog | 9 |
4 files changed, 22 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 27fe1af22..2e4840e56 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.95 2005/10/09 18:07:06 mchehab Exp $ + * $Id: cx88-video.c,v 1.96 2005/10/10 22:07:19 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -2219,8 +2219,16 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, up(&core->lock); /* start tvaudio thread */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) if (core->tuner_type != TUNER_ABSENT) core->kthread = kthread_run(cx88_audio_thread, core, "cx88 tvaudio"); +#else + /*FIXME: Not sure if this will work */ + if (core->tuner_type != TUNER_ABSENT) + kernel_thread (cx88_audio_thread, core, 0); + + core->kthread = NULL; +#endif return 0; fail_unreg: diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index e0d6b125e..b6ab3a3ee 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -1672,6 +1672,8 @@ static int msp_attach(struct i2c_adapter *adap, int addr, unsigned short flags, if (NULL == msp->kthread) printk(KERN_WARNING "msp34xx: kernel_thread() failed\n"); #else + /*FIXME: Not sure if this will work */ + msp->kthread = NULL; kernel_thread (thread_func, c, 0); #endif diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c index e0d6b125e..b6ab3a3ee 100644 --- a/linux/drivers/media/video/msp3400.c +++ b/linux/drivers/media/video/msp3400.c @@ -1672,6 +1672,8 @@ static int msp_attach(struct i2c_adapter *adap, int addr, unsigned short flags, if (NULL == msp->kthread) printk(KERN_WARNING "msp34xx: kernel_thread() failed\n"); #else + /*FIXME: Not sure if this will work */ + msp->kthread = NULL; kernel_thread (thread_func, c, 0); #endif diff --git a/v4l/ChangeLog b/v4l/ChangeLog index cfd1b2cc1..03a05b4b2 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-10-10 22:04 mchehab + + * ../linux/drivers/media/video/cx88/cx88-video.c: (cx8800_initdev): + * ../linux/drivers/media/video/msp3400.c: (msp_attach): + + - Some fixups for 2.4 kernel. + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-10-10 21:53 mchehab * ../linux/drivers/media/video/msp3400.c: |