]> err.no Git - linux-2.6/commitdiff
V4L/DVB (4428): Fix tda826x detection
authorAndrew de Quincey <adq_dvb@lidskialf.net>
Tue, 8 Aug 2006 18:48:07 +0000 (15:48 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Tue, 26 Sep 2006 14:53:37 +0000 (11:53 -0300)
The tda826x detection was (correctly) cleaned up earlier, but unfortunately
changing the number of received i2c messages from 2 -> 1 was missed. This
fixes it.

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/dvb/frontends/tda826x.c

index 7c19b88e950f7b223df4ff5bfcce9b5c02858979..eeab26bd36edf6ed1b64064c460be36624ec0e2c 100644 (file)
@@ -133,18 +133,18 @@ struct dvb_frontend *tda826x_attach(struct dvb_frontend *fe, int addr, struct i2
 {
        struct tda826x_priv *priv = NULL;
        u8 b1 [] = { 0, 0 };
-       struct i2c_msg msg [] = { { .addr = addr, .flags = I2C_M_RD, .buf = b1, .len = 2 } };
+       struct i2c_msg msg = { .addr = addr, .flags = I2C_M_RD, .buf = b1, .len = 2 };
        int ret;
 
        dprintk("%s:\n", __FUNCTION__);
 
        if (fe->ops.i2c_gate_ctrl)
                fe->ops.i2c_gate_ctrl(fe, 1);
-       ret = i2c_transfer (i2c, msg, 1);
+       ret = i2c_transfer (i2c, &msg, 1);
        if (fe->ops.i2c_gate_ctrl)
                fe->ops.i2c_gate_ctrl(fe, 0);
 
-       if (ret != 2)
+       if (ret != 1)
                return NULL;
        if (!(b1[1] & 0x80))
                return NULL;