summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-02-01 10:28:20 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-01 10:28:20 -0200
commitdc2ad40ab4bd4332ce049aa88f1f0041b1472994 (patch)
tree5332c2fe7ea77ae91e3013c46440437c3baa78c2 /linux
parent7a73a04f8c7b81f45b0f44b522a2e59eb02f3299 (diff)
parentb1d07a100a489df3cd03e3dc629d76bebce559f7 (diff)
downloadmediapointer-dvb-s2-dc2ad40ab4bd4332ce049aa88f1f0041b1472994.tar.gz
mediapointer-dvb-s2-dc2ad40ab4bd4332ce049aa88f1f0041b1472994.tar.bz2
merge: http://linuxtv.org/hg/~dheitmueller/v4l-dvb-s5h1409
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/dvb/frontends/s5h1409.c7
1 files changed, 4 insertions, 3 deletions
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;
}