3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb.h b/drivers/media/dvb/dvb-usb/dvb_usb.h
index 8ec8deefaf6..98504b59b10 100644
--- a/drivers/media/dvb/dvb-usb/dvb_usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -100,9 +100,6 @@ struct dvb_usb_adapter_properties {
 	int (*pid_filter_ctrl) (struct dvb_usb_adapter *, int);
 	int (*pid_filter) (struct dvb_usb_adapter *, int, u16, int);
 
-	int (*fe_ioctl_override) (struct dvb_frontend *,
-			unsigned int, void *, unsigned int);
-
 	struct usb_data_stream_properties stream;
 };
 
@@ -189,6 +186,8 @@ struct dvb_usb_device_properties {
 	int (*tuner_attach) (struct dvb_usb_adapter *);
 	int (*frontend_ctrl) (struct dvb_frontend *, int);
 	int (*streaming_ctrl) (struct dvb_usb_adapter *, int);
+	int (*fe_ioctl_override) (struct dvb_frontend *,
+			unsigned int, void *, unsigned int);
 
 #define WARM                  0
 #define COLD                  1
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c b/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
index 6149236e4ef..d436a158202 100644
--- a/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
@@ -204,7 +204,6 @@ int dvb_usbv2_adapter_dvb_init(struct dvb_usb_adapter *adap)
 		goto err;
 	}
 	adap->dvb_adap.priv = adap;
-	adap->dvb_adap.fe_ioctl_override = adap->props->fe_ioctl_override;
 
 	if (adap->dev->props->read_mac_address) {
 		if (adap->dev->props->read_mac_address(adap->dev,
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
index 1297b95aff4..e393fb55739 100644
--- a/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -279,6 +279,8 @@ static int dvb_usbv2_adapter_init(struct dvb_usb_device *d)
 		if (adap->fe[1])
 			adap->dvb_adap.mfe_shared = 1;
 
+		adap->dvb_adap.fe_ioctl_override = d->props->fe_ioctl_override;
+
 		d->num_adapters_initialized++;
 	}