summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/frontends/stv0288.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-10-13 12:09:52 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-13 12:09:52 -0200
commitc04e90e2d38493e6c092095cc2441365dd3973af (patch)
tree10f7dd48868de244e34380fc45ecac99601d9027 /linux/drivers/media/dvb/frontends/stv0288.c
parent2cea09a7e6ff7e5202803e6a6c2279ed254d7dff (diff)
parenta0184c08027dba2f30a12bcd1ca1ca1da7fc7963 (diff)
downloadmediapointer-dvb-s2-c04e90e2d38493e6c092095cc2441365dd3973af.tar.gz
mediapointer-dvb-s2-c04e90e2d38493e6c092095cc2441365dd3973af.tar.bz2
merge: http://linuxtv.org/hg/~stoth/s2
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/stv0288.c')
-rw-r--r--linux/drivers/media/dvb/frontends/stv0288.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/frontends/stv0288.c b/linux/drivers/media/dvb/frontends/stv0288.c
index 90e72e771..ff1194de3 100644
--- a/linux/drivers/media/dvb/frontends/stv0288.c
+++ b/linux/drivers/media/dvb/frontends/stv0288.c
@@ -328,16 +328,28 @@ static int stv0288_init(struct dvb_frontend *fe)
{
struct stv0288_state *state = fe->demodulator_priv;
int i;
+ u8 reg;
+ u8 val;
dprintk("stv0288: init chip\n");
stv0288_writeregI(state, 0x41, 0x04);
msleep(50);
- for (i = 0; !(stv0288_inittab[i] == 0xff &&
+ /* we have default inittab */
+ if (state->config->inittab == NULL) {
+ for (i = 0; !(stv0288_inittab[i] == 0xff &&
stv0288_inittab[i + 1] == 0xff); i += 2)
- stv0288_writeregI(state, stv0288_inittab[i],
- stv0288_inittab[i + 1]);
-
+ stv0288_writeregI(state, stv0288_inittab[i],
+ stv0288_inittab[i + 1]);
+ } else {
+ for (i = 0; ; i += 2) {
+ reg = state->config->inittab[i];
+ val = state->config->inittab[i+1];
+ if (reg == 0xff && val == 0xff)
+ break;
+ stv0288_writeregI(state, reg, val);
+ }
+ }
return 0;
}