git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
media
/
dvb
/
frontends
/
bsru6.h
diff --git
a/drivers/media/dvb/frontends/bsru6.h
b/drivers/media/dvb/frontends/bsru6.h
index
e231cd8
..
2a5366c
100644
(file)
--- a/
drivers/media/dvb/frontends/bsru6.h
+++ b/
drivers/media/dvb/frontends/bsru6.h
@@
-101,12
+101,11
@@
static int alps_bsru6_set_symbol_rate(struct dvb_frontend *fe, u32 srate, u32 ra
return 0;
}
return 0;
}
-static int alps_bsru6_
tuner_set_params(struct dvb_frontend *fe
, struct dvb_frontend_parameters *params)
+static int alps_bsru6_
pll_set(struct dvb_frontend *fe, struct i2c_adapter *i2c
, struct dvb_frontend_parameters *params)
{
u8 buf[4];
u32 div;
struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
{
u8 buf[4];
u32 div;
struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
- struct i2c_adapter *i2c = fe->tuner_priv;
if ((params->frequency < 950000) || (params->frequency > 2150000))
return -EINVAL;
if ((params->frequency < 950000) || (params->frequency > 2150000))
return -EINVAL;
@@
-120,8
+119,6
@@
static int alps_bsru6_tuner_set_params(struct dvb_frontend *fe, struct dvb_front
if (params->frequency > 1530000)
buf[3] = 0xc0;
if (params->frequency > 1530000)
buf[3] = 0xc0;
- if (fe->ops.i2c_gate_ctrl)
- fe->ops.i2c_gate_ctrl(fe, 1);
if (i2c_transfer(i2c, &msg, 1) != 1)
return -EIO;
return 0;
if (i2c_transfer(i2c, &msg, 1) != 1)
return -EIO;
return 0;
@@
-137,6
+134,7
@@
static struct stv0299_config alps_bsru6_config = {
.volt13_op0_op1 = STV0299_VOLT13_OP1,
.min_delay_ms = 100,
.set_symbol_rate = alps_bsru6_set_symbol_rate,
.volt13_op0_op1 = STV0299_VOLT13_OP1,
.min_delay_ms = 100,
.set_symbol_rate = alps_bsru6_set_symbol_rate,
+ .pll_set = alps_bsru6_pll_set,
};
#endif
};
#endif