Commit e4a49d76 authored by Andrew de Quincey's avatar Andrew de Quincey Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4428): Fix tda826x detection 



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: default avatarAndrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 17aafcc6

drivers/media/dvb/frontends/tda826x.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -133,18 +133,18 @@ struct dvb_frontend *tda826x_attach(struct dvb_frontend *fe, int addr, struct i2 
{

{

	struct tda826x_priv *priv = NULL;

	struct tda826x_priv *priv = NULL;

	u8 b1 [] = { 0, 0 };

	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;

	int ret;





	dprintk("%s:\n", __FUNCTION__);

	dprintk("%s:\n", __FUNCTION__);





	if (fe->ops.i2c_gate_ctrl)

	if (fe->ops.i2c_gate_ctrl)

		fe->ops.i2c_gate_ctrl(fe, 1);

		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)

	if (fe->ops.i2c_gate_ctrl)

		fe->ops.i2c_gate_ctrl(fe, 0);

		fe->ops.i2c_gate_ctrl(fe, 0);





	if (ret != 2)

	if (ret != 1)

		return NULL;

		return NULL;

	if (!(b1[1] & 0x80))

	if (!(b1[1] & 0x80))

		return NULL;

		return NULL;