Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/media/dvb/frontends/cx24110.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff -puN drivers/media/dvb/frontends/cx24110.c~cx24110-conexant-frontend-update-tidy drivers/media/dvb/frontends/cx24110.c
--- 25/drivers/media/dvb/frontends/cx24110.c~cx24110-conexant-frontend-update-tidy 2005-03-07 22:19:56.000000000 -0800
+++ 25-akpm/drivers/media/dvb/frontends/cx24110.c 2005-03-07 22:21:19.000000000 -0800
@@ -403,21 +403,25 @@ static int cx24110_set_voltage (struct d
};
}
-static int cx24110_diseqc_send_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
+static int cx24110_diseqc_send_burst(struct dvb_frontend* fe,
+ fe_sec_mini_cmd_t burst)
{
int rv, bit, i;
- struct cx24110_state *state = (struct cx24110_state*) fe->demodulator_priv;
+ struct cx24110_state *state = fe->demodulator_priv;
- if(burst==SEC_MINI_A) {bit=0x00;}
- else if(burst==SEC_MINI_B) {bit=0x08;}
- else return -EINVAL;
+ if (burst == SEC_MINI_A)
+ bit = 0x00;
+ else if (burst == SEC_MINI_B)
+ bit = 0x08;
+ else
+ return -EINVAL;
rv = cx24110_readreg(state, 0x77);
cx24110_writereg(state, 0x77, rv|0x04);
rv = cx24110_readreg(state, 0x76);
cx24110_writereg(state, 0x76, ((rv & 0x90) | 0x40 | bit));
- for (i=500; i-- > 0 && !(cx24110_readreg(state,0x76)&0x40);)
+ for (i = 500; i-- > 0 && !(cx24110_readreg(state,0x76)&0x40) ; )
; /* wait for LNB ready */
return 0;
_