From 1a3d16cded633d614bbcacc9190785dc37d04b0f Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Mon, 20 Oct 2008 10:17:08 -0300 Subject: [PATCH] --- yaml --- r: 117054 b: refs/heads/master c: f0d041e50bc6c8a677922d72b010f80af9b23b18 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/s5h1411.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 379c22b83cfd..5d4dad04f6e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1874c443280d61bef1466a30c1e2819656d54eea +refs/heads/master: f0d041e50bc6c8a677922d72b010f80af9b23b18 diff --git a/trunk/drivers/media/dvb/frontends/s5h1411.c b/trunk/drivers/media/dvb/frontends/s5h1411.c index e328d88bcbd4..40e0fedf381e 100644 --- a/trunk/drivers/media/dvb/frontends/s5h1411.c +++ b/trunk/drivers/media/dvb/frontends/s5h1411.c @@ -585,9 +585,6 @@ static int s5h1411_set_frontend(struct dvb_frontend *fe, s5h1411_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); @@ -598,6 +595,10 @@ static int s5h1411_set_frontend(struct dvb_frontend *fe, fe->ops.i2c_gate_ctrl(fe, 0); } + /* Issue a reset to the demod so it knows to resync against the + newly tuned frequency */ + s5h1411_softreset(fe); + return 0; }