UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
This commit is contained in:
Steven Toth 2006-01-09 15:25:22 -02:00 committed by Mauro Carvalho Chehab
parent 2c3f11b20f
commit 0144f31466
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/media/dvb/frontends/cx24123.c
View File

@ -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) static int cx24123_pll_writereg(struct dvb_frontend* fe, struct dvb_frontend_parameters *p, u32 data)
{ {
struct cx24123_state *state = fe->demodulator_priv; struct cx24123_state *state = fe->demodulator_priv;
unsigned long timeout;
u8 timeout = 0;
/* align the 21 bytes into to bit23 boundary */ /* align the 21 bytes into to bit23 boundary */
data = data << 3; 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 */ /* Reset the demod pll word length to 0x15 bits */
cx24123_writereg(state, 0x21, 0x15); cx24123_writereg(state, 0x21, 0x15);
timeout = 0;
/* write the msb 8 bits, wait for the send to be completed */ /* 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); cx24123_writereg(state, 0x22, (data >> 16) & 0xff);
while ( ( cx24123_readreg(state, 0x20) & 0x40 ) == 0 ) while ((cx24123_readreg(state, 0x20) & 0x40) == 0) {
{ if (time_after(jiffies, timeout)) {
/* Safety - No reason why the write should not complete, and we never get here, avoid hang */ printk("%s: demodulator is not responding, possibly hung, aborting.\n", __FUNCTION__);
if (timeout++ >= 4) {
printk("%s: demodulator is no longer responding, aborting.\n",__FUNCTION__);
return -EREMOTEIO; return -EREMOTEIO;
} }
msleep(500); msleep(10);
} }
timeout = 0;
/* send another 8 bytes, wait for the send to be completed */ /* send another 8 bytes, wait for the send to be completed */
timeout = jiffies + msecs_to_jiffies(40);
cx24123_writereg(state, 0x22, (data>>8) & 0xff ); cx24123_writereg(state, 0x22, (data>>8) & 0xff );
while ( (cx24123_readreg(state, 0x20) & 0x40 ) == 0 ) while ((cx24123_readreg(state, 0x20) & 0x40) == 0) {
{ if (time_after(jiffies, timeout)) {
/* Safety - No reason why the write should not complete, and we never get here, avoid hang */ printk("%s: demodulator is not responding, possibly hung, aborting.\n", __FUNCTION__);
if (timeout++ >= 4) {
printk("%s: demodulator is not responding, possibly hung, aborting.\n",__FUNCTION__);
return -EREMOTEIO; 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 */ /* 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 ); cx24123_writereg(state, 0x22, (data) & 0xff );
while ((cx24123_readreg(state, 0x20) & 0x80)) while ((cx24123_readreg(state, 0x20) & 0x80)) {
{ if (time_after(jiffies, timeout)) {
/* Safety - No reason why the write should not complete, and we never get here, avoid hang */ printk("%s: demodulator is not responding, possibly hung, aborting.\n", __FUNCTION__);
if (timeout++ >= 4) {
printk("%s: demodulator is not responding, possibly hung, aborting.\n",__FUNCTION__);
return -EREMOTEIO; return -EREMOTEIO;
} }
msleep(500); msleep(10);
} }
/* Trigger the demod to configure the tuner */ /* Trigger the demod to configure the tuner */