diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2016-02-20 01:58:43 +0100 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2016-02-20 01:58:43 +0100 |
commit | 4c4400504f6ada0cfed682fbe7e6c65efbda3952 (patch) | |
tree | 5452eb39c76081fc871abdf1a38ccf3668f5cb4f /drivers/media/dvb-frontends/as102_fe.c | |
parent | Merge branch 'drm-rockchip-next-2016-02-18' of https://github.com/markyzq/ker... (diff) | |
parent | [media] vsp1_drm.h: add missing prototypes (diff) | |
download | linux-4c4400504f6ada0cfed682fbe7e6c65efbda3952.tar.xz linux-4c4400504f6ada0cfed682fbe7e6c65efbda3952.zip |
Merge remote-tracking branch 'linuxtv/vsp1' into HEAD
Diffstat (limited to 'drivers/media/dvb-frontends/as102_fe.c')
-rw-r--r-- | drivers/media/dvb-frontends/as102_fe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb-frontends/as102_fe.c b/drivers/media/dvb-frontends/as102_fe.c index 544c5f65d19a..9412fcd1bddb 100644 --- a/drivers/media/dvb-frontends/as102_fe.c +++ b/drivers/media/dvb-frontends/as102_fe.c @@ -190,10 +190,10 @@ static int as102_fe_set_frontend(struct dvb_frontend *fe) return state->ops->set_tune(state->priv, &tune_args); } -static int as102_fe_get_frontend(struct dvb_frontend *fe) +static int as102_fe_get_frontend(struct dvb_frontend *fe, + struct dtv_frontend_properties *c) { struct as102_state *state = fe->demodulator_priv; - struct dtv_frontend_properties *c = &fe->dtv_property_cache; int ret = 0; struct as10x_tps tps = { 0 }; |