diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-02-01 17:46:28 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-02-01 17:46:28 +0100 |
| commit | ad4f519e3cf44cffa54140b1b211078a171633f6 (patch) | |
| tree | a18b013ce9a8f216ad9ab5ad6168ef70eada2244 /linux/drivers/media/dvb/frontends | |
| parent | 173b6c4977dc5d99c1273fe0e139dc6d5d6f7d6e (diff) | |
| parent | 40db5f952453121ccdf3ad610cb209984df4b1c0 (diff) | |
| download | mediapointer-dvb-s2-ad4f519e3cf44cffa54140b1b211078a171633f6.tar.gz mediapointer-dvb-s2-ad4f519e3cf44cffa54140b1b211078a171633f6.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/dvb/frontends')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/cx24116.c | 7 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/s5h1409.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/frontends/cx24116.c b/linux/drivers/media/dvb/frontends/cx24116.c index db1e1e4ea..8301a9865 100644 --- a/linux/drivers/media/dvb/frontends/cx24116.c +++ b/linux/drivers/media/dvb/frontends/cx24116.c @@ -1184,7 +1184,12 @@ static int cx24116_initfe(struct dvb_frontend *fe) if (ret != 0) return ret; - return cx24116_diseqc_init(fe); + ret = cx24116_diseqc_init(fe); + if (ret != 0) + return ret; + + /* HVR-4000 needs this */ + return cx24116_set_voltage(fe, SEC_VOLTAGE_13); } /* diff --git a/linux/drivers/media/dvb/frontends/s5h1409.c b/linux/drivers/media/dvb/frontends/s5h1409.c index cf4d8936b..3e08d985d 100644 --- a/linux/drivers/media/dvb/frontends/s5h1409.c +++ b/linux/drivers/media/dvb/frontends/s5h1409.c @@ -545,9 +545,6 @@ static int s5h1409_set_frontend(struct dvb_frontend *fe, s5h1409_enable_modulation(fe, p->u.vsb.modulation); - /* Allow the demod to settle */ - msleep(100); - if (fe->ops.tuner_ops.set_params) { if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 1); @@ -562,6 +559,10 @@ static int s5h1409_set_frontend(struct dvb_frontend *fe, s5h1409_set_qam_interleave_mode(fe); } + /* Issue a reset to the demod so it knows to resync against the + newly tuned frequency */ + s5h1409_softreset(fe); + return 0; } |