Commit ef3d2dc3 authored Mar 12, 2012 by Michael Krufky Committed by Mauro Carvalho Chehab Mar 19, 2012

[media] au8522: bug-fix: enable modulation AFTER tune (instead of before tuning)



The au8522 driver programs the tuner after programming the demodulator,
but the tuner should be programmed first. This patch fixes this behavior.

EDIT: Apparantly Devin created a similar patch some time ago, but hasn't
submitted it for merge.  I never saw his patch, but I thank him anyhow
for his efforts.  In addition, Devin pointed out a flaw in my patch:

This newly generated patch takes Devin's comments into account.

Thanks-to: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Cc: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 22f1732f

drivers/media/dvb/frontends/au8522_dig.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -588,11 +588,6 @@ static int au8522_set_frontend(struct dvb_frontend *fe)
		(state->current_modulation == c->modulation))
		return 0;

		au8522_enable_modulation(fe, c->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);
		@@ -604,6 +599,11 @@ static int au8522_set_frontend(struct dvb_frontend *fe)
		if (ret < 0)
		return ret;

		/* Allow the tuner to settle */
		msleep(100);

		au8522_enable_modulation(fe, c->modulation);

		state->current_frequency = c->frequency;

		return 0;