diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-20 01:02:01 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-20 01:02:01 +0100 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /drivers/media/dvb/frontends/bsbe1.h | |
| parent | Input: wacom - fix physical size calculation for 3rd-gen Bamboo (diff) | |
| parent | Input: ili210x - add support for Ilitek ILI210x based touchscreens (diff) | |
| download | linux-10ce3cc919f50c2043b41ca968b43c26a3672600.tar.xz linux-10ce3cc919f50c2043b41ca968b43c26a3672600.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/media/dvb/frontends/bsbe1.h')
| -rw-r--r-- | drivers/media/dvb/frontends/bsbe1.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/dvb/frontends/bsbe1.h b/drivers/media/dvb/frontends/bsbe1.h index 5e431ebd089b..53e4d0dbb745 100644 --- a/drivers/media/dvb/frontends/bsbe1.h +++ b/drivers/media/dvb/frontends/bsbe1.h @@ -69,18 +69,19 @@ static int alps_bsbe1_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ra return 0; } -static int alps_bsbe1_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) +static int alps_bsbe1_tuner_set_params(struct dvb_frontend *fe) { + struct dtv_frontend_properties *p = &fe->dtv_property_cache; int ret; u8 data[4]; u32 div; struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) }; struct i2c_adapter *i2c = fe->tuner_priv; - if ((params->frequency < 950000) || (params->frequency > 2150000)) + if ((p->frequency < 950000) || (p->frequency > 2150000)) return -EINVAL; - div = params->frequency / 1000; + div = p->frequency / 1000; data[0] = (div >> 8) & 0x7f; data[1] = div & 0xff; data[2] = 0x80 | ((div & 0x18000) >> 10) | 0x1; |