1 files changed, 33 insertions, 10 deletions

diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index ed5c161c1c4..c3e461e9fa7 100644
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -86,12 +86,12 @@ static int m920x_init(struct dvb_usb_device *d, struct m920x_inits *rc_seq)
         }
 
         for (i = 0; i < d->props.num_adapters; i++)
-                flags |= d->adapter[i].props.caps;
+                flags |= d->adapter[i].props.fe[0].caps;
 
         /* Some devices(Dposh) might crash if we attempt touch at all. */
         if (flags & DVB_USB_ADAP_HAS_PID_FILTER) {
                 for (i = 0; i < d->props.num_adapters; i++) {
-                        epi = d->adapter[i].props.stream.endpoint - 0x81;
+                        epi = d->adapter[i].props.fe[0].stream.endpoint - 0x81;
 
                         if (epi < 0 || epi >= M9206_MAX_ADAPTERS) {
                                 printk(KERN_INFO "m920x: Unexpected adapter endpoint!\n");
@@ -292,7 +292,7 @@ static int m920x_update_filters(struct dvb_usb_adapter *adap)
         struct m920x_state *m = adap->dev->priv;
         int enabled = m->filtering_enabled[adap->id];
         int i, ret = 0, filter = 0;
-        int ep = adap->props.stream.endpoint;
+        int ep = adap->props.fe[0].stream.endpoint;
 
         for (i = 0; i < M9206_MAX_FILTERS; i++)
                 if (m->filters[adap->id][i] == 8192)
@@ -501,7 +501,7 @@ static int m920x_mt352_frontend_attach(struct dvb_usb_adapter *adap)
 {
         deb("%s\n",__func__);
 
-        if ((adap->fe[0] = dvb_attach(mt352_attach,
+        if ((adap->fe_adap[0].fe = dvb_attach(mt352_attach,
                                    &m920x_mt352_config,
                                    &adap->dev->i2c_adap)) == NULL)
                 return -EIO;
@@ -513,7 +513,7 @@ static int m920x_tda10046_08_frontend_attach(struct dvb_usb_adapter *adap)
 {
         deb("%s\n",__func__);
 
-        if ((adap->fe[0] = dvb_attach(tda10046_attach,
+        if ((adap->fe_adap[0].fe = dvb_attach(tda10046_attach,
                                    &m920x_tda10046_08_config,
                                    &adap->dev->i2c_adap)) == NULL)
                 return -EIO;
@@ -525,7 +525,7 @@ static int m920x_tda10046_0b_frontend_attach(struct dvb_usb_adapter *adap)
 {
         deb("%s\n",__func__);
 
-        if ((adap->fe[0] = dvb_attach(tda10046_attach,
+        if ((adap->fe_adap[0].fe = dvb_attach(tda10046_attach,
                                    &m920x_tda10046_0b_config,
                                    &adap->dev->i2c_adap)) == NULL)
                 return -EIO;
@@ -537,7 +537,7 @@ static int m920x_qt1010_tuner_attach(struct dvb_usb_adapter *adap)
 {
         deb("%s\n",__func__);
 
-        if (dvb_attach(qt1010_attach, adap->fe[0], &adap->dev->i2c_adap, &m920x_qt1010_config) == NULL)
+        if (dvb_attach(qt1010_attach, adap->fe_adap[0].fe, &adap->dev->i2c_adap, &m920x_qt1010_config) == NULL)
                 return -ENODEV;
 
         return 0;
@@ -547,7 +547,7 @@ static int m920x_tda8275_60_tuner_attach(struct dvb_usb_adapter *adap)
 {
         deb("%s\n",__func__);
 
-        if (dvb_attach(tda827x_attach, adap->fe[0], 0x60, &adap->dev->i2c_adap, NULL) == NULL)
+        if (dvb_attach(tda827x_attach, adap->fe_adap[0].fe, 0x60, &adap->dev->i2c_adap, NULL) == NULL)
                 return -ENODEV;
 
         return 0;
@@ -557,7 +557,7 @@ static int m920x_tda8275_61_tuner_attach(struct dvb_usb_adapter *adap)
 {
         deb("%s\n",__func__);
 
-        if (dvb_attach(tda827x_attach, adap->fe[0], 0x61, &adap->dev->i2c_adap, NULL) == NULL)
+        if (dvb_attach(tda827x_attach, adap->fe_adap[0].fe, 0x61, &adap->dev->i2c_adap, NULL) == NULL)
                 return -ENODEV;
 
         return 0;
@@ -565,7 +565,7 @@ static int m920x_tda8275_61_tuner_attach(struct dvb_usb_adapter *adap)
 
 static int m920x_fmd1216me_tuner_attach(struct dvb_usb_adapter *adap)
 {
-        dvb_attach(simple_tuner_attach, adap->fe[0],
+        dvb_attach(simple_tuner_attach, adap->fe_adap[0].fe,
                    &adap->dev->i2c_adap, 0x61,
                    TUNER_PHILIPS_FMD1216ME_MK3);
         return 0;
@@ -807,6 +807,9 @@ static struct dvb_usb_device_properties megasky_properties = {
         .identify_state   = m920x_identify_state,
         .num_adapters = 1,
         .adapter = {{
+                .num_frontends = 1,
+                .fe = {{
+
                 .caps = DVB_USB_ADAP_HAS_PID_FILTER |
                         DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
 
@@ -827,6 +830,7 @@ static struct dvb_usb_device_properties megasky_properties = {
                                 }
                         }
                 },
+                }},
         }},
         .i2c_algo         = &m920x_i2c_algo,
 
@@ -851,6 +855,9 @@ static struct dvb_usb_device_properties digivox_mini_ii_properties = {
         .identify_state   = m920x_identify_state,
         .num_adapters = 1,
         .adapter = {{
+                .num_frontends = 1,
+                .fe = {{
+
                 .caps = DVB_USB_ADAP_HAS_PID_FILTER |
                         DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
 
@@ -871,6 +878,7 @@ static struct dvb_usb_device_properties digivox_mini_ii_properties = {
                                 }
                         }
                 },
+                }},
         }},
         .i2c_algo         = &m920x_i2c_algo,
 
@@ -910,6 +918,9 @@ static struct dvb_usb_device_properties tvwalkertwin_properties = {
         .identify_state   = m920x_identify_state,
         .num_adapters = 2,
         .adapter = {{
+                .num_frontends = 1,
+                .fe = {{
+
                 .caps = DVB_USB_ADAP_HAS_PID_FILTER |
                         DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
 
@@ -929,7 +940,11 @@ static struct dvb_usb_device_properties tvwalkertwin_properties = {
                                          .buffersize = 512,
                                  }
                         }
+                }},
                 }},{
+                .num_frontends = 1,
+                .fe = {{
+
                 .caps = DVB_USB_ADAP_HAS_PID_FILTER |
                         DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
 
@@ -949,6 +964,7 @@ static struct dvb_usb_device_properties tvwalkertwin_properties = {
                                          .buffersize = 512,
                                  }
                         }
+                }},
                 },
         }},
         .i2c_algo         = &m920x_i2c_algo,
@@ -974,6 +990,8 @@ static struct dvb_usb_device_properties dposh_properties = {
         .identify_state   = m920x_identify_state,
         .num_adapters = 1,
         .adapter = {{
+                .num_frontends = 1,
+                .fe = {{
                 /* Hardware pid filters don't work with this device/firmware */
 
                 .frontend_attach  = m920x_mt352_frontend_attach,
@@ -989,6 +1007,7 @@ static struct dvb_usb_device_properties dposh_properties = {
                                  }
                         }
                 },
+                }},
         }},
         .i2c_algo         = &m920x_i2c_algo,
 
@@ -1019,6 +1038,9 @@ static struct dvb_usb_device_properties pinnacle_pctv310e_properties = {
         .identify_state   = m920x_identify_state,
         .num_adapters = 1,
         .adapter = {{
+                .num_frontends = 1,
+                .fe = {{
+
                 .caps = DVB_USB_ADAP_HAS_PID_FILTER |
                         DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
 
@@ -1041,6 +1063,7 @@ static struct dvb_usb_device_properties pinnacle_pctv310e_properties = {
                                 }
                         }
                 },
+                }},
         } },
         .i2c_algo         = &m920x_i2c_algo,