diff options
Diffstat (limited to 'drivers/media/dvb/frontends')
-rw-r--r-- | drivers/media/dvb/frontends/stv0299.c | 6 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/stv0299.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c index cfa3928bb487..db66d417df38 100644 --- a/drivers/media/dvb/frontends/stv0299.c +++ b/drivers/media/dvb/frontends/stv0299.c | |||
@@ -481,7 +481,7 @@ static int stv0299_init (struct dvb_frontend* fe) | |||
481 | 481 | ||
482 | if (state->config->pll_init) { | 482 | if (state->config->pll_init) { |
483 | stv0299_writeregI(state, 0x05, 0xb5); /* enable i2c repeater on stv0299 */ | 483 | stv0299_writeregI(state, 0x05, 0xb5); /* enable i2c repeater on stv0299 */ |
484 | state->config->pll_init(fe); | 484 | state->config->pll_init(fe, state->i2c); |
485 | stv0299_writeregI(state, 0x05, 0x35); /* disable i2c repeater on stv0299 */ | 485 | stv0299_writeregI(state, 0x05, 0x35); /* disable i2c repeater on stv0299 */ |
486 | } | 486 | } |
487 | 487 | ||
@@ -603,7 +603,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
603 | } else { | 603 | } else { |
604 | /* A "normal" tune is requested */ | 604 | /* A "normal" tune is requested */ |
605 | stv0299_writeregI(state, 0x05, 0xb5); /* enable i2c repeater on stv0299 */ | 605 | stv0299_writeregI(state, 0x05, 0xb5); /* enable i2c repeater on stv0299 */ |
606 | state->config->pll_set(fe, p); | 606 | state->config->pll_set(fe, state->i2c, p); |
607 | stv0299_writeregI(state, 0x05, 0x35); /* disable i2c repeater on stv0299 */ | 607 | stv0299_writeregI(state, 0x05, 0x35); /* disable i2c repeater on stv0299 */ |
608 | 608 | ||
609 | stv0299_writeregI(state, 0x32, 0x80); | 609 | stv0299_writeregI(state, 0x32, 0x80); |
@@ -615,7 +615,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
615 | } | 615 | } |
616 | } else { | 616 | } else { |
617 | stv0299_writeregI(state, 0x05, 0xb5); /* enable i2c repeater on stv0299 */ | 617 | stv0299_writeregI(state, 0x05, 0xb5); /* enable i2c repeater on stv0299 */ |
618 | state->config->pll_set(fe, p); | 618 | state->config->pll_set(fe, state->i2c, p); |
619 | stv0299_writeregI(state, 0x05, 0x35); /* disable i2c repeater on stv0299 */ | 619 | stv0299_writeregI(state, 0x05, 0x35); /* disable i2c repeater on stv0299 */ |
620 | 620 | ||
621 | stv0299_set_FEC (state, p->u.qpsk.fec_inner); | 621 | stv0299_set_FEC (state, p->u.qpsk.fec_inner); |
diff --git a/drivers/media/dvb/frontends/stv0299.h b/drivers/media/dvb/frontends/stv0299.h index 79457a80a11f..d0c4484861e1 100644 --- a/drivers/media/dvb/frontends/stv0299.h +++ b/drivers/media/dvb/frontends/stv0299.h | |||
@@ -92,8 +92,8 @@ struct stv0299_config | |||
92 | int (*set_symbol_rate)(struct dvb_frontend* fe, u32 srate, u32 ratio); | 92 | int (*set_symbol_rate)(struct dvb_frontend* fe, u32 srate, u32 ratio); |
93 | 93 | ||
94 | /* PLL maintenance */ | 94 | /* PLL maintenance */ |
95 | int (*pll_init)(struct dvb_frontend* fe); | 95 | int (*pll_init)(struct dvb_frontend *fe, struct i2c_adapter *i2c); |
96 | int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params); | 96 | int (*pll_set)(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters *params); |
97 | }; | 97 | }; |
98 | 98 | ||
99 | extern int stv0299_writereg (struct dvb_frontend* fe, u8 reg, u8 data); | 99 | extern int stv0299_writereg (struct dvb_frontend* fe, u8 reg, u8 data); |