diff options
Diffstat (limited to 'drivers/media/dvb/frontends/stv090x.c')
-rw-r--r-- | drivers/media/dvb/frontends/stv090x.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c index ebda41936b90..4aef1877ed42 100644 --- a/drivers/media/dvb/frontends/stv090x.c +++ b/drivers/media/dvb/frontends/stv090x.c | |||
@@ -3427,17 +3427,17 @@ err: | |||
3427 | return -1; | 3427 | return -1; |
3428 | } | 3428 | } |
3429 | 3429 | ||
3430 | static enum dvbfe_search stv090x_search(struct dvb_frontend *fe, struct dvb_frontend_parameters *p) | 3430 | static enum dvbfe_search stv090x_search(struct dvb_frontend *fe) |
3431 | { | 3431 | { |
3432 | struct stv090x_state *state = fe->demodulator_priv; | 3432 | struct stv090x_state *state = fe->demodulator_priv; |
3433 | struct dtv_frontend_properties *props = &fe->dtv_property_cache; | 3433 | struct dtv_frontend_properties *props = &fe->dtv_property_cache; |
3434 | 3434 | ||
3435 | if (p->frequency == 0) | 3435 | if (props->frequency == 0) |
3436 | return DVBFE_ALGO_SEARCH_INVALID; | 3436 | return DVBFE_ALGO_SEARCH_INVALID; |
3437 | 3437 | ||
3438 | state->delsys = props->delivery_system; | 3438 | state->delsys = props->delivery_system; |
3439 | state->frequency = p->frequency; | 3439 | state->frequency = props->frequency; |
3440 | state->srate = p->u.qpsk.symbol_rate; | 3440 | state->srate = props->symbol_rate; |
3441 | state->search_mode = STV090x_SEARCH_AUTO; | 3441 | state->search_mode = STV090x_SEARCH_AUTO; |
3442 | state->algo = STV090x_COLD_SEARCH; | 3442 | state->algo = STV090x_COLD_SEARCH; |
3443 | state->fec = STV090x_PRERR; | 3443 | state->fec = STV090x_PRERR; |
@@ -4712,10 +4712,9 @@ int stv090x_set_gpio(struct dvb_frontend *fe, u8 gpio, u8 dir, u8 value, | |||
4712 | EXPORT_SYMBOL(stv090x_set_gpio); | 4712 | EXPORT_SYMBOL(stv090x_set_gpio); |
4713 | 4713 | ||
4714 | static struct dvb_frontend_ops stv090x_ops = { | 4714 | static struct dvb_frontend_ops stv090x_ops = { |
4715 | 4715 | .delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS }, | |
4716 | .info = { | 4716 | .info = { |
4717 | .name = "STV090x Multistandard", | 4717 | .name = "STV090x Multistandard", |
4718 | .type = FE_QPSK, | ||
4719 | .frequency_min = 950000, | 4718 | .frequency_min = 950000, |
4720 | .frequency_max = 2150000, | 4719 | .frequency_max = 2150000, |
4721 | .frequency_stepsize = 0, | 4720 | .frequency_stepsize = 0, |
@@ -4743,7 +4742,7 @@ static struct dvb_frontend_ops stv090x_ops = { | |||
4743 | .read_status = stv090x_read_status, | 4742 | .read_status = stv090x_read_status, |
4744 | .read_ber = stv090x_read_per, | 4743 | .read_ber = stv090x_read_per, |
4745 | .read_signal_strength = stv090x_read_signal_strength, | 4744 | .read_signal_strength = stv090x_read_signal_strength, |
4746 | .read_snr = stv090x_read_cnr | 4745 | .read_snr = stv090x_read_cnr, |
4747 | }; | 4746 | }; |
4748 | 4747 | ||
4749 | 4748 | ||