From aab1f06b0cba170c41fdc235d44a417d162a83a6 Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Fri, 15 Jun 2012 02:10:50 -0300
Subject: [PATCH] --- yaml --- r: 330629 b: refs/heads/master c:
 6dca4ea3ecb3d33ce49a9bb7d1f40a75bbea8aec h: refs/heads/master i:   330627:
 4b4ced849b45af6c6640a99775ec700ef1865ab4 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/dvb/dvb-usb/dvb_usb.h      | 5 ++---
 trunk/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c  | 1 -
 trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c | 2 ++
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0f86000eb38c..dfef8c80170a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d70521a396cecb11dc8bd4212d2502dc797d3d67
+refs/heads/master: 6dca4ea3ecb3d33ce49a9bb7d1f40a75bbea8aec
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
index 8ec8deefaf6a..98504b59b102 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
+++ b/trunk/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/trunk/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
index 6149236e4ef8..d436a1582022 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
+++ b/trunk/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/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
index 1297b95aff48..e393fb557398 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/trunk/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++;
 	}