diff options
Diffstat (limited to 'drivers/media/dvb/frontends/cx24113.c')
-rw-r--r-- | drivers/media/dvb/frontends/cx24113.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/dvb/frontends/cx24113.c b/drivers/media/dvb/frontends/cx24113.c index c341d57d5e81..3883c3b31aef 100644 --- a/drivers/media/dvb/frontends/cx24113.c +++ b/drivers/media/dvb/frontends/cx24113.c | |||
@@ -476,21 +476,21 @@ static int cx24113_init(struct dvb_frontend *fe) | |||
476 | return ret; | 476 | return ret; |
477 | } | 477 | } |
478 | 478 | ||
479 | static int cx24113_set_params(struct dvb_frontend *fe, | 479 | static int cx24113_set_params(struct dvb_frontend *fe) |
480 | struct dvb_frontend_parameters *p) | ||
481 | { | 480 | { |
481 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | ||
482 | struct cx24113_state *state = fe->tuner_priv; | 482 | struct cx24113_state *state = fe->tuner_priv; |
483 | /* for a ROLL-OFF factor of 0.35, 0.2: 600, 0.25: 625 */ | 483 | /* for a ROLL-OFF factor of 0.35, 0.2: 600, 0.25: 625 */ |
484 | u32 roll_off = 675; | 484 | u32 roll_off = 675; |
485 | u32 bw; | 485 | u32 bw; |
486 | 486 | ||
487 | bw = ((p->u.qpsk.symbol_rate/100) * roll_off) / 1000; | 487 | bw = ((c->symbol_rate/100) * roll_off) / 1000; |
488 | bw += (10000000/100) + 5; | 488 | bw += (10000000/100) + 5; |
489 | bw /= 10; | 489 | bw /= 10; |
490 | bw += 1000; | 490 | bw += 1000; |
491 | cx24113_set_bandwidth(state, bw); | 491 | cx24113_set_bandwidth(state, bw); |
492 | 492 | ||
493 | cx24113_set_frequency(state, p->frequency); | 493 | cx24113_set_frequency(state, c->frequency); |
494 | msleep(5); | 494 | msleep(5); |
495 | return cx24113_get_status(fe, &bw); | 495 | return cx24113_get_status(fe, &bw); |
496 | } | 496 | } |
@@ -547,11 +547,9 @@ static const struct dvb_tuner_ops cx24113_tuner_ops = { | |||
547 | .release = cx24113_release, | 547 | .release = cx24113_release, |
548 | 548 | ||
549 | .init = cx24113_init, | 549 | .init = cx24113_init, |
550 | .sleep = NULL, | ||
551 | 550 | ||
552 | .set_params = cx24113_set_params, | 551 | .set_params = cx24113_set_params, |
553 | .get_frequency = cx24113_get_frequency, | 552 | .get_frequency = cx24113_get_frequency, |
554 | .get_bandwidth = NULL, | ||
555 | .get_status = cx24113_get_status, | 553 | .get_status = cx24113_get_status, |
556 | }; | 554 | }; |
557 | 555 | ||