diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-03 16:09:56 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-03 16:09:56 +0200 |
| commit | bc0868c62bb13834b20a864f684cced1f84a2412 (patch) | |
| tree | 2c382dcd24ac95f4dbf53d238d3161d6171d8a4b /drivers/media/dvb-frontends/cxd2820r_t.c | |
| parent | regulator: pwm: Try to avoid voltage error in duty cycle calculation (diff) | |
| parent | regulator: pwm: Use pwm_get_args() where appropriate (diff) | |
| download | linux-bc0868c62bb13834b20a864f684cced1f84a2412.tar.xz linux-bc0868c62bb13834b20a864f684cced1f84a2412.zip | |
Merge branch 'for-4.7/pwm-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm into regulator-pwm
Diffstat (limited to 'drivers/media/dvb-frontends/cxd2820r_t.c')
| -rw-r--r-- | drivers/media/dvb-frontends/cxd2820r_t.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb-frontends/cxd2820r_t.c b/drivers/media/dvb-frontends/cxd2820r_t.c index 21abf1b4ed4d..75ce7d8ded00 100644 --- a/drivers/media/dvb-frontends/cxd2820r_t.c +++ b/drivers/media/dvb-frontends/cxd2820r_t.c @@ -138,10 +138,10 @@ error: return ret; } -int cxd2820r_get_frontend_t(struct dvb_frontend *fe) +int cxd2820r_get_frontend_t(struct dvb_frontend *fe, + struct dtv_frontend_properties *c) { struct cxd2820r_priv *priv = fe->demodulator_priv; - struct dtv_frontend_properties *c = &fe->dtv_property_cache; int ret; u8 buf[2]; |