tree-wide: fix assorted typos all over the place

[safe/jmp/linux-2.6] / drivers / media / dvb / dvb-usb / dibusb-mb.c

diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index 67cd484..5c0126d 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -14,6 +14,8 @@
  */
 #include "dibusb.h"
 
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
 static int dib3000mb_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
 {
        struct dvb_usb_adapter *adap = fe->dvb->priv;
@@ -45,7 +47,7 @@ static int dibusb_thomson_tuner_attach(struct dvb_usb_adapter *adap)
        st->tuner_addr = 0x61;
 
        dvb_attach(dvb_pll_attach, adap->fe, 0x61, &adap->dev->i2c_adap,
-                  &dvb_pll_tua6010xs);
+                  DVB_PLL_TUA6010XS);
        return 0;
 }
 
@@ -56,7 +58,7 @@ static int dibusb_panasonic_tuner_attach(struct dvb_usb_adapter *adap)
        st->tuner_addr = 0x60;
 
        dvb_attach(dvb_pll_attach, adap->fe, 0x60, &adap->dev->i2c_adap,
-                  &dvb_pll_tda665x);
+                  DVB_PLL_TDA665X);
        return 0;
 }
 
@@ -74,7 +76,7 @@ static int dibusb_tuner_probe_and_attach(struct dvb_usb_adapter *adap)
        struct dibusb_state *st = adap->priv;
 
        /* the Panasonic sits on I2C addrass 0x60, the Thomson on 0x61 */
-       st->tuner_addr = 0x60;
+       msg[0].addr = msg[1].addr = st->tuner_addr = 0x60;
 
        if (adap->fe->ops.i2c_gate_ctrl)
                adap->fe->ops.i2c_gate_ctrl(adap->fe,1);
@@ -107,10 +109,14 @@ static struct dvb_usb_device_properties artec_t1_usb2_properties;
 static int dibusb_probe(struct usb_interface *intf,
                const struct usb_device_id *id)
 {
-       if (dvb_usb_device_init(intf,&dibusb1_1_properties,THIS_MODULE,NULL) == 0 ||
-               dvb_usb_device_init(intf,&dibusb1_1_an2235_properties,THIS_MODULE,NULL) == 0 ||
-               dvb_usb_device_init(intf,&dibusb2_0b_properties,THIS_MODULE,NULL) == 0 ||
-               dvb_usb_device_init(intf,&artec_t1_usb2_properties,THIS_MODULE,NULL) == 0)
+       if (0 == dvb_usb_device_init(intf, &dibusb1_1_properties,
+                                    THIS_MODULE, NULL, adapter_nr) ||
+           0 == dvb_usb_device_init(intf, &dibusb1_1_an2235_properties,
+                                    THIS_MODULE, NULL, adapter_nr) ||
+           0 == dvb_usb_device_init(intf, &dibusb2_0b_properties,
+                                    THIS_MODULE, NULL, adapter_nr) ||
+           0 == dvb_usb_device_init(intf, &artec_t1_usb2_properties,
+                                    THIS_MODULE, NULL, adapter_nr))
                return 0;
 
        return -EINVAL;
@@ -236,7 +242,7 @@ static struct dvb_usb_device_properties dibusb1_1_properties = {
                        { &dibusb_dib3000mb_table[9],  &dibusb_dib3000mb_table[11], NULL },
                        { &dibusb_dib3000mb_table[10], &dibusb_dib3000mb_table[12], NULL },
                },
-               {       "Unkown USB1.1 DVB-T device ???? please report the name to the author",
+               {       "Unknown USB1.1 DVB-T device ???? please report the name to the author",
                        { &dibusb_dib3000mb_table[13], NULL },
                        { &dibusb_dib3000mb_table[14], NULL },
                },