diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-01 11:40:27 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-01 11:40:27 -0200 |
| commit | 40db5f952453121ccdf3ad610cb209984df4b1c0 (patch) | |
| tree | 8dae68b23f086de70c0a8b79dcb3f24dd6492159 /linux/drivers/media/dvb | |
| parent | fd237d0264b616b7a22369b14e56952e2bc306c5 (diff) | |
| parent | 9fdaf8936ef6a151aed8baf835bf98716e2b33bf (diff) | |
| download | mediapointer-dvb-s2-40db5f952453121ccdf3ad610cb209984df4b1c0.tar.gz mediapointer-dvb-s2-40db5f952453121ccdf3ad610cb209984df4b1c0.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/fixes
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb')
| -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; } |