Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 674ce343 authored by Andreas Oberritter's avatar Andreas Oberritter Committed by Mauro Carvalho Chehab
Browse files

[media] DVB: dvb_frontend: remove static assignments from dtv_property_cache_sync() 



  dtv_property_cache_init().
  dtv_property_process_get().
  overwritten with invalid values, leading to partially incorrect
  results when calling FE_GET_PROPERTY.

Signed-off-by: default avatarAndreas Oberritter <obi@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3f5c14d3

drivers/media/dvb/dvb-core/dvb_frontend.c

+24 −5
Original line number Diff line number Diff line
@@ -1019,6 +1019,29 @@ static int is_legacy_delivery_system(fe_delivery_system_t s) 
	return 0;

}



/* Initialize the cache with some default values derived from the

 * legacy frontend_info structure.

 */

static void dtv_property_cache_init(struct dvb_frontend *fe,

				    struct dtv_frontend_properties *c)

{

	switch (fe->ops.info.type) {

	case FE_QPSK:

		c->modulation = QPSK;   /* implied for DVB-S in legacy API */

		c->rolloff = ROLLOFF_35;/* implied for DVB-S */

		c->delivery_system = SYS_DVBS;

		break;

	case FE_QAM:

		c->delivery_system = SYS_DVBC_ANNEX_AC;

		break;

	case FE_OFDM:

		c->delivery_system = SYS_DVBT;

		break;

	case FE_ATSC:

		break;

	}

}



/* Synchronise the legacy tuning parameters into the cache, so that demodulator

 * drivers can use a single set_frontend tuning function, regardless of whether

 * it's being used for the legacy or new API, reducing code and complexity.
@@ -1032,17 +1055,13 @@ static void dtv_property_cache_sync(struct dvb_frontend *fe, 


	switch (fe->ops.info.type) {

	case FE_QPSK:

		c->modulation = QPSK;   /* implied for DVB-S in legacy API */

		c->rolloff = ROLLOFF_35;/* implied for DVB-S */

		c->symbol_rate = p->u.qpsk.symbol_rate;

		c->fec_inner = p->u.qpsk.fec_inner;

		c->delivery_system = SYS_DVBS;

		break;

	case FE_QAM:

		c->symbol_rate = p->u.qam.symbol_rate;

		c->fec_inner = p->u.qam.fec_inner;

		c->modulation = p->u.qam.modulation;

		c->delivery_system = SYS_DVBC_ANNEX_AC;

		break;

	case FE_OFDM:

		if (p->u.ofdm.bandwidth == BANDWIDTH_6_MHZ)
@@ -1060,7 +1079,6 @@ static void dtv_property_cache_sync(struct dvb_frontend *fe, 
		c->transmission_mode = p->u.ofdm.transmission_mode;

		c->guard_interval = p->u.ofdm.guard_interval;

		c->hierarchy = p->u.ofdm.hierarchy_information;

		c->delivery_system = SYS_DVBT;

		break;

	case FE_ATSC:

		c->modulation = p->u.vsb.modulation;
@@ -1821,6 +1839,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file, 


			memcpy (&fepriv->parameters_in, parg,

				sizeof (struct dvb_frontend_parameters));

			dtv_property_cache_init(fe, c);

			dtv_property_cache_sync(fe, c, &fepriv->parameters_in);

		}