Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

V4L/DVB (4322): Fix dvb-pll autoprobing 



Trent Piepho pointed out that the pll test i2c transmission is slightly
wrong; it was transmitting a zero length message, and then reading from the
PLL. This was wrong; it should only be transmitting a single read i2c message.

Signed-off-by: default avatarAndrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 55c05b6d

drivers/media/dvb/frontends/dvb-pll.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -614,8 +614,7 @@ static struct dvb_tuner_ops dvb_pll_tuner_ops = { 
int dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2c, struct dvb_pll_desc *desc)

int dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2c, struct dvb_pll_desc *desc)

{

{

	u8 b1 [] = { 0 };

	u8 b1 [] = { 0 };

	struct i2c_msg msg [] = { { .addr = pll_addr, .flags = 0, .buf = NULL, .len = 0 },

	struct i2c_msg msg = { .addr = pll_addr, .flags = I2C_M_RD, .buf = b1, .len = 1 };

				  { .addr = pll_addr, .flags = I2C_M_RD, .buf = b1, .len = 1 } };

	struct dvb_pll_priv *priv = NULL;

	struct dvb_pll_priv *priv = NULL;

	int ret;

	int ret;
@@ -623,8 +622,8 @@ int dvb_pll_attach(struct dvb_frontend *fe, int pll_addr, struct i2c_adapter *i2 
		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, 2);

		ret = i2c_transfer (i2c, &msg, 1);

		if (ret != 2)

		if (ret != 1)

			return -1;

			return -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);