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

Commit 0144f314 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3130): cx24123: cleanup timout handling 



- Cleanup timeout handling in cx24123_pll_writereg(), and
use a reasonable value for the timeout.

Signed-off-by: default avatarSteven Toth <stoth@hauppauge.com>
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
parent 2c3f11b2

drivers/media/dvb/frontends/cx24123.c

+16 −23
Original line number Diff line number Diff line
@@ -487,8 +487,7 @@ static int cx24123_pll_calculate(struct dvb_frontend* fe, struct dvb_frontend_pa 
static int cx24123_pll_writereg(struct dvb_frontend* fe, struct dvb_frontend_parameters *p, u32 data)

{

	struct cx24123_state *state = fe->demodulator_priv;



	u8 timeout = 0;

	unsigned long timeout;



	/* align the 21 bytes into to bit23 boundary */

	data = data << 3;
@@ -496,43 +495,37 @@ static int cx24123_pll_writereg(struct dvb_frontend* fe, struct dvb_frontend_par 
	/* Reset the demod pll word length to 0x15 bits */

	cx24123_writereg(state, 0x21, 0x15);



	timeout = 0;

	/* write the msb 8 bits, wait for the send to be completed */

	timeout = jiffies + msecs_to_jiffies(40);

	cx24123_writereg(state, 0x22, (data >> 16) & 0xff);

	while ( ( cx24123_readreg(state, 0x20) & 0x40 ) == 0 )

	{

		/* Safety - No reason why the write should not complete, and we never get here, avoid hang */

		if (timeout++ >= 4) {

			printk("%s:  demodulator is no longer responding, aborting.\n",__FUNCTION__);

	while ((cx24123_readreg(state, 0x20) & 0x40) == 0) {

		if (time_after(jiffies, timeout)) {

			printk("%s:  demodulator is not responding, possibly hung, aborting.\n", __FUNCTION__);

			return -EREMOTEIO;

		}

		msleep(500);

		msleep(10);

	}



	timeout = 0;

	/* send another 8 bytes, wait for the send to be completed */

	timeout = jiffies + msecs_to_jiffies(40);

	cx24123_writereg(state, 0x22, (data>>8) & 0xff );

	while ( (cx24123_readreg(state, 0x20) & 0x40 ) == 0 )

	{

		/* Safety - No reason why the write should not complete, and we never get here, avoid hang */

		if (timeout++ >= 4) {

	while ((cx24123_readreg(state, 0x20) & 0x40) == 0) {

		if (time_after(jiffies, timeout)) {

			printk("%s:  demodulator is not responding, possibly hung, aborting.\n", __FUNCTION__);

			return -EREMOTEIO;

		}

		msleep(500);

		msleep(10);

	}



	timeout = 0;

	/* send the lower 5 bits of this byte, padded with 3 LBB, wait for the send to be completed */

	timeout = jiffies + msecs_to_jiffies(40);

	cx24123_writereg(state, 0x22, (data) & 0xff );

	while ((cx24123_readreg(state, 0x20) & 0x80))

	{

		/* Safety - No reason why the write should not complete, and we never get here, avoid hang */

		if (timeout++ >= 4) {

	while ((cx24123_readreg(state, 0x20) & 0x80)) {

		if (time_after(jiffies, timeout)) {

			printk("%s:  demodulator is not responding, possibly hung, aborting.\n", __FUNCTION__);

			return -EREMOTEIO;

		}

		msleep(500);

		msleep(10);

	}



	/* Trigger the demod to configure the tuner */