Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mirror_ubuntu-artful-kernel.git] / drivers / media / dvb / dvb-usb / cxusb.c

diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 949ea1bc0aae8ae9a48982674251a4442316fed1..3940bb0f9ef62dd8b3121d3ee0a7739669581d90 100644 (file)
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -1067,18 +1067,17 @@ static struct dib0070_config dib7070p_dib0070_config = {
 };
 
 struct dib0700_adapter_state {
-       int (*set_param_save) (struct dvb_frontend *,
-                              struct dvb_frontend_parameters *);
+       int (*set_param_save) (struct dvb_frontend *);
 };
 
-static int dib7070_set_param_override(struct dvb_frontend *fe,
-                                     struct dvb_frontend_parameters *fep)
+static int dib7070_set_param_override(struct dvb_frontend *fe)
 {
+       struct dtv_frontend_properties *p = &fe->dtv_property_cache;
        struct dvb_usb_adapter *adap = fe->dvb->priv;
        struct dib0700_adapter_state *state = adap->priv;
 
        u16 offset;
-       u8 band = BAND_OF_FREQUENCY(fep->frequency/1000);
+       u8 band = BAND_OF_FREQUENCY(p->frequency/1000);
        switch (band) {
        case BAND_VHF: offset = 950; break;
        default:
@@ -1087,7 +1086,7 @@ static int dib7070_set_param_override(struct dvb_frontend *fe,
 
        dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe));
 
-       return state->set_param_save(fe, fep);
+       return state->set_param_save(fe);
 }
 
 static int cxusb_dualdig4_rev2_tuner_attach(struct dvb_usb_adapter *adap)