vserver 1.9.3

[linux-2.6.git] / drivers / media / video / tda7432.c

diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 015f2f5..20051a0 100644 (file)
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -338,8 +338,8 @@ static int tda7432_attach(struct i2c_adapter *adap, int addr, int kind)
 
 static int tda7432_probe(struct i2c_adapter *adap)
 {
-#ifdef I2C_ADAP_CLASS_TV_ANALOG
-       if (adap->class & I2C_ADAP_CLASS_TV_ANALOG)
+#ifdef I2C_CLASS_TV_ANALOG
+       if (adap->class & I2C_CLASS_TV_ANALOG)
                return i2c_probe(adap, &addr_data, tda7432_attach);
 #else
        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
@@ -532,17 +532,17 @@ static struct i2c_client client_template =
        .driver     = &driver, 
 };
 
-static int tda7432_init(void)
+static int __init tda7432_init(void)
 {
        if ( (loudness < 0) || (loudness > 15) ) {
                printk(KERN_ERR "tda7432: loudness parameter must be between 0 and 15\n");
                return -EINVAL;
        }
-       i2c_add_driver(&driver);
-       return 0;
+
+       return i2c_add_driver(&driver);
 }
 
-static void tda7432_fini(void)
+static void __exit tda7432_fini(void)
 {
        i2c_del_driver(&driver);
 }