vserver 2.0 rc7

[linux-2.6.git] / drivers / media / dvb / ttpci / av7110_v4l.c

diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index 0c618dd..e65fc36 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -46,13 +46,13 @@ int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val)
 
        if (i2c_transfer(&av7110->i2c_adap, &msgs, 1) != 1) {
                dprintk(1, "dvb-ttpci: failed @ card %d, %u = %u\n",
-                      av7110->dvb_adapter->num, reg, val);
+                      av7110->dvb_adapter.num, reg, val);
                return -EIO;
        }
        return 0;
 }
 
-int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
+static int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
 {
        u8 msg1[3] = { dev, reg >> 8, reg & 0xff };
        u8 msg2[2];
@@ -63,15 +63,13 @@ int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
 
        if (i2c_transfer(&av7110->i2c_adap, &msgs[0], 2) != 2) {
                dprintk(1, "dvb-ttpci: failed @ card %d, %u\n",
-                      av7110->dvb_adapter->num, reg);
+                      av7110->dvb_adapter.num, reg);
                return -EIO;
        }
        *val = (msg2[0] << 8) | msg2[1];
        return 0;
 }
 
-
-
 static struct v4l2_input inputs[2] = {
        {
                .index          = 0,
@@ -554,13 +552,13 @@ int av7110_init_analog_module(struct av7110 *av7110)
                return -ENODEV;
 
        printk("dvb-ttpci: DVB-C analog module @ card %d detected, initializing MSP3400\n",
-               av7110->dvb_adapter->num);
+               av7110->dvb_adapter.num);
        av7110->adac_type = DVB_ADAC_MSP;
        msleep(100); // the probing above resets the msp...
        msp_readreg(av7110, MSP_RD_DSP, 0x001e, &version1);
        msp_readreg(av7110, MSP_RD_DSP, 0x001f, &version2);
        dprintk(1, "dvb-ttpci: @ card %d MSP3400 version 0x%04x 0x%04x\n",
-               av7110->dvb_adapter->num, version1, version2);
+               av7110->dvb_adapter.num, version1, version2);
        msp_writereg(av7110, MSP_WR_DSP, 0x0013, 0x0c00);
        msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0x7f00); // loudspeaker + headphone
        msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0220); // loudspeaker source
@@ -598,7 +596,7 @@ int av7110_init_analog_module(struct av7110 *av7110)
                /* init the saa7113 */
                while (*i != 0xff) {
                        if (i2c_writereg(av7110, 0x48, i[0], i[1]) != 1) {
-                               dprintk(1, "saa7113 initialization failed @ card %d", av7110->dvb_adapter->num);
+                               dprintk(1, "saa7113 initialization failed @ card %d", av7110->dvb_adapter.num);
                                break;
                        }
                        i += 2;
@@ -728,11 +726,11 @@ static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
 {
        struct av7110 *av7110 = (struct av7110*) dev->ext_priv;
 
-       if (std->id == V4L2_STD_PAL) {
+       if (std->id & V4L2_STD_PAL) {
                av7110->vidmode = VIDEO_MODE_PAL;
                av7110_set_vidmode(av7110, av7110->vidmode);
        }
-       else if (std->id == V4L2_STD_NTSC) {
+       else if (std->id & V4L2_STD_NTSC) {
                av7110->vidmode = VIDEO_MODE_NTSC;
                av7110_set_vidmode(av7110, av7110->vidmode);
        }