Merge branch 'nfs-for-2.6.32'

[pandora-kernel.git] / drivers / media / dvb / frontends / stv0288.c

diff --git a/drivers/media/dvb/frontends/stv0288.c b/drivers/media/dvb/frontends/stv0288.c
index 90e72e7..2930a5d 100644 (file)
--- a/drivers/media/dvb/frontends/stv0288.c
+++ b/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;
 }
 
@@ -558,7 +570,7 @@ struct dvb_frontend *stv0288_attach(const struct stv0288_config *config,
        int id;
 
        /* allocate memory for the internal state */
-       state = kmalloc(sizeof(struct stv0288_state), GFP_KERNEL);
+       state = kzalloc(sizeof(struct stv0288_state), GFP_KERNEL);
        if (state == NULL)
                goto error;