Re: [PATCH] BTTV, drivers/char/videodev.c, 2.4.0-test4

From: Arnd Bergmann (310069511139-0001@t-online.de)
Date: Sat Jul 15 2000 - 04:59:03 EST


Jeffrey W. Baker wrote:
> On Fri, 14 Jul 2000, Richard Gooch wrote:
> >
> > BTTV was fine for me in 2.4.0-test2.
It works as a module for me but not in-kernel.

>
> Okay, Okay :) To be exact, *I* have had build bustage of some kind in
> every 2.4.0-test kernel, and BTTV has definitely been broken in test3 and
> test4. The patch fixes the brokenness. This patch has to get applied one
> way or another, because i2c_tuner_init just isn't implemented anywhere
> anymore.
>
Your patch introduces another bug, which was also there in some -ac patches.
I have reported this as well. The tuner must no longer be be
intialized by videodev_init, since this is already be done by the
module_init macro call in tuner.c.
Just remove those calls completely (see below).

Arnd <><

--- videodev.c.bak Wed Jul 12 03:17:00 2000
+++ videodev.c Fri Jul 14 12:56:25 2000
@@ -61,9 +62,6 @@
 #endif /* CONFIG_PROC_FS && CONFIG_VIDEO_PROC_FS */

-#ifdef CONFIG_VIDEO_BT848
-extern int i2c_tuner_init(struct video_init *);
-#endif
 #ifdef CONFIG_VIDEO_BWQCAM
 extern int init_bw_qcams(struct video_init *);
 #endif
@@ -78,9 +76,6 @@
 #endif

 static struct video_init video_init_list[]={
-#ifdef CONFIG_VIDEO_BT848
- {"i2c-tuner", i2c_tuner_init},
-#endif
 #ifdef CONFIG_VIDEO_BWQCAM
        {"bw-qcam", init_bw_qcams},
 #endif
--- i2c-old.c.bak Wed Jul 12 03:19:10 2000
+++ i2c-old.c Wed Jul 12 03:19:36 2000
@@ -36,10 +36,6 @@
 static struct i2c_driver *drivers[I2C_DRIVER_MAX];
 static int bus_count = 0, driver_count = 0;

-#ifdef CONFIG_VIDEO_BT848
-extern int i2c_tuner_init(void);
-extern int msp3400c_init(void);
-#endif
 #ifdef CONFIG_VIDEO_BUZ
 extern int saa7111_init(void);
 extern int saa7185_init(void);
@@ -54,10 +50,6 @@
        printk(KERN_INFO "i2c: initialized%s\n",
                scan ? " (i2c bus scan enabled)" : "");
        /* anything to do here ? */
-#ifdef CONFIG_VIDEO_BT848
- i2c_tuner_init();
- msp3400c_init();
-#endif
 #ifdef CONFIG_VIDEO_BUZ
        saa7111_init();
        saa7185_init();

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Jul 15 2000 - 21:00:21 EST