include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / media / dvb / frontends / stv6110x.c

diff --git a/drivers/media/dvb/frontends/stv6110x.c b/drivers/media/dvb/frontends/stv6110x.c
index 945790e..dea4245 100644 (file)
--- a/drivers/media/dvb/frontends/stv6110x.c
+++ b/drivers/media/dvb/frontends/stv6110x.c
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 
 #include "dvb_frontend.h"
@@ -362,6 +363,7 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
 {
        struct stv6110x_state *stv6110x;
        u8 default_regs[] = {0x07, 0x11, 0xdc, 0x85, 0x17, 0x01, 0xe6, 0x1e};
+       int ret;
 
        stv6110x = kzalloc(sizeof (struct stv6110x_state), GFP_KERNEL);
        if (stv6110x == NULL)
@@ -372,6 +374,43 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
        stv6110x->devctl        = &stv6110x_ctl;
        memcpy(stv6110x->regs, default_regs, 8);
 
+       /* setup divider */
+       switch (stv6110x->config->clk_div) {
+       default:
+       case 1:
+               STV6110x_SETFIELD(stv6110x->regs[STV6110x_CTRL2], CTRL2_CO_DIV, 0);
+               break;
+       case 2:
+               STV6110x_SETFIELD(stv6110x->regs[STV6110x_CTRL2], CTRL2_CO_DIV, 1);
+               break;
+       case 4:
+               STV6110x_SETFIELD(stv6110x->regs[STV6110x_CTRL2], CTRL2_CO_DIV, 2);
+               break;
+       case 8:
+       case 0:
+               STV6110x_SETFIELD(stv6110x->regs[STV6110x_CTRL2], CTRL2_CO_DIV, 3);
+               break;
+       }
+
+       if (fe->ops.i2c_gate_ctrl) {
+               ret = fe->ops.i2c_gate_ctrl(fe, 1);
+               if (ret < 0)
+                       goto error;
+       }
+
+       ret = stv6110x_write_regs(stv6110x, 0, stv6110x->regs,
+                                 ARRAY_SIZE(stv6110x->regs));
+       if (ret < 0) {
+               dprintk(FE_ERROR, 1, "Initialization failed");
+               goto error;
+       }
+
+       if (fe->ops.i2c_gate_ctrl) {
+               ret = fe->ops.i2c_gate_ctrl(fe, 0);
+               if (ret < 0)
+                       goto error;
+       }
+
        fe->tuner_priv          = stv6110x;
        fe->ops.tuner_ops       = stv6110x_ops;