V4L/DVB (9222): S2API: Add Multiple-frontend on a single adapter support.

A detailed description from the original patches 2 years ago:

"The WinTV-HVR3000 has a single transport bus which is shared between
a DVB-T and DVB-S modulator. These patches build on the bus acquisition
cx88 work from a few weeks ago to add support for this.

So to applications the HVR3000 looks like this:
/dev/dvb/adapter0/fe0 (cx24123 DVB-S demod)
/dev/dvb/adapter0/fe1 (cx22702 DVB-T demod)

Additional boards continue as before, eg:
/dev/dvb/adapter1/fe0 (lgdt3302 ATSC demod)

The basic change is removing the single instance of the videobuf_dvb in
cx8802_dev and saa7134_dev(?) and replacing it with a list and some
supporting functions.

*NOTE* This branch was taken before v4l-dvb was closed for 2.6.19 so
two or three current cx88 patches appear to be reversed by this tree,
this will be cleaned up in the near future. The patches missing change
the mutex handing to core->lock, fix an enumeration problem."

It should be recognised that a number of people have been maintaining
this patchset. Significant levels of Kudos to everyone one involved,
including but not limited to:

Darron Broad
Fabio M. Di Nitto
Carlo Scarfoglio
Hans Werner

Without the work of these people, and countless others, my two year old
patches would of died on the Mercurial linuxtv.org vine a long time
ago.

TODO: Revise these patches a little further so that the need for
demux1 and dvr0 is optional, not mandatory on the HVR3000.

HISTORY (darron):
This is the last update to MFE prepared by Hans which is based
upon the `scratchpad' diff created by Carlo.
All MFE work prior to that point must be attributed to Fabio
who ported and maintained Steve's original patch up to that
time.

Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Darron Broad <darron@kewl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 112 insertions, 95 deletions

diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 87c10983266f..8ada0497fa03 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -535,11 +535,15 @@ static int configure_tda827x_fe(struct saa7134_dev *dev,
                                 struct tda1004x_config *cdec_conf,
                                 struct tda827x_config *tuner_conf)
 {
-        dev->dvb.frontend = dvb_attach(tda10046_attach, cdec_conf, &dev->i2c_adap);
-        if (dev->dvb.frontend) {
+        struct videobuf_dvb_frontend *fe0;
+
+        fe0 = videobuf_dvb_get_frontend(&dev->frontends, 0);
+
+        fe0->dvb.frontend = dvb_attach(tda10046_attach, cdec_conf, &dev->i2c_adap);
+        if (fe0->dvb.frontend) {
                 if (cdec_conf->i2c_gate)
-                        dev->dvb.frontend->ops.i2c_gate_ctrl = tda8290_i2c_gate_ctrl;
-                if (dvb_attach(tda827x_attach, dev->dvb.frontend,
+                        fe0->dvb.frontend->ops.i2c_gate_ctrl = tda8290_i2c_gate_ctrl;
+                if (dvb_attach(tda827x_attach, fe0->dvb.frontend,
                                cdec_conf->tuner_address,
                                &dev->i2c_adap, tuner_conf))
                         return 0;
@@ -944,12 +948,18 @@ static int dvb_init(struct saa7134_dev *dev)
 {
         int ret;
         int attach_xc3028 = 0;
+        struct videobuf_dvb_frontend *fe0;
+
+        /* Get the first frontend */
+        fe0 = videobuf_dvb_get_frontend(&dev->frontends, 0);
+        if (!fe0)
+                return -EINVAL;
 
         /* init struct videobuf_dvb */
         dev->ts.nr_bufs    = 32;
         dev->ts.nr_packets = 32*4;
-        dev->dvb.name = dev->name;
-        videobuf_queue_sg_init(&dev->dvb.dvbq, &saa7134_ts_qops,
+        fe0->dvb.name = dev->name;
+        videobuf_queue_sg_init(&fe0->dvb.dvbq, &saa7134_ts_qops,
                             &dev->pci->dev, &dev->slock,
                             V4L2_BUF_TYPE_VIDEO_CAPTURE,
                             V4L2_FIELD_ALTERNATE,
@@ -959,47 +969,47 @@ static int dvb_init(struct saa7134_dev *dev)
         switch (dev->board) {
         case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL:
                 dprintk("pinnacle 300i dvb setup\n");
-                dev->dvb.frontend = dvb_attach(mt352_attach, &pinnacle_300i,
+                fe0->dvb.frontend = dvb_attach(mt352_attach, &pinnacle_300i,
                                                &dev->i2c_adap);
-                if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops.tuner_ops.set_params = mt352_pinnacle_tuner_set_params;
+                if (fe0->dvb.frontend) {
+                        fe0->dvb.frontend->ops.tuner_ops.set_params = mt352_pinnacle_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_AVERMEDIA_777:
         case SAA7134_BOARD_AVERMEDIA_A16AR:
                 dprintk("avertv 777 dvb setup\n");
-                dev->dvb.frontend = dvb_attach(mt352_attach, &avermedia_777,
+                fe0->dvb.frontend = dvb_attach(mt352_attach, &avermedia_777,
                                                &dev->i2c_adap);
-                if (dev->dvb.frontend) {
-                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                if (fe0->dvb.frontend) {
+                        dvb_attach(simple_tuner_attach, fe0->dvb.frontend,
                                    &dev->i2c_adap, 0x61,
                                    TUNER_PHILIPS_TD1316);
                 }
                 break;
         case SAA7134_BOARD_AVERMEDIA_A16D:
                 dprintk("AverMedia A16D dvb setup\n");
-                dev->dvb.frontend = dvb_attach(mt352_attach,
+                fe0->dvb.frontend = dvb_attach(mt352_attach,
                                                 &avermedia_xc3028_mt352_dev,
                                                 &dev->i2c_adap);
                 attach_xc3028 = 1;
                 break;
         case SAA7134_BOARD_MD7134:
-                dev->dvb.frontend = dvb_attach(tda10046_attach,
+                fe0->dvb.frontend = dvb_attach(tda10046_attach,
                                                &medion_cardbus,
                                                &dev->i2c_adap);
-                if (dev->dvb.frontend) {
-                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                if (fe0->dvb.frontend) {
+                        dvb_attach(simple_tuner_attach, fe0->dvb.frontend,
                                    &dev->i2c_adap, medion_cardbus.tuner_address,
                                    TUNER_PHILIPS_FMD1216ME_MK3);
                 }
                 break;
         case SAA7134_BOARD_PHILIPS_TOUGH:
-                dev->dvb.frontend = dvb_attach(tda10046_attach,
+                fe0->dvb.frontend = dvb_attach(tda10046_attach,
                                                &philips_tu1216_60_config,
                                                &dev->i2c_adap);
-                if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_init;
-                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_tda6651_pll_set;
+                if (fe0->dvb.frontend) {
+                        fe0->dvb.frontend->ops.tuner_ops.init = philips_tu1216_init;
+                        fe0->dvb.frontend->ops.tuner_ops.set_params = philips_tda6651_pll_set;
                 }
                 break;
         case SAA7134_BOARD_FLYDVBTDUO:
@@ -1010,24 +1020,24 @@ static int dvb_init(struct saa7134_dev *dev)
                 break;
         case SAA7134_BOARD_PHILIPS_EUROPA:
         case SAA7134_BOARD_VIDEOMATE_DVBT_300:
-                dev->dvb.frontend = dvb_attach(tda10046_attach,
+                fe0->dvb.frontend = dvb_attach(tda10046_attach,
                                                &philips_europa_config,
                                                &dev->i2c_adap);
-                if (dev->dvb.frontend) {
-                        dev->original_demod_sleep = dev->dvb.frontend->ops.sleep;
-                        dev->dvb.frontend->ops.sleep = philips_europa_demod_sleep;
-                        dev->dvb.frontend->ops.tuner_ops.init = philips_europa_tuner_init;
-                        dev->dvb.frontend->ops.tuner_ops.sleep = philips_europa_tuner_sleep;
-                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_td1316_tuner_set_params;
+                if (fe0->dvb.frontend) {
+                        dev->original_demod_sleep = fe0->dvb.frontend->ops.sleep;
+                        fe0->dvb.frontend->ops.sleep = philips_europa_demod_sleep;
+                        fe0->dvb.frontend->ops.tuner_ops.init = philips_europa_tuner_init;
+                        fe0->dvb.frontend->ops.tuner_ops.sleep = philips_europa_tuner_sleep;
+                        fe0->dvb.frontend->ops.tuner_ops.set_params = philips_td1316_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_VIDEOMATE_DVBT_200:
-                dev->dvb.frontend = dvb_attach(tda10046_attach,
+                fe0->dvb.frontend = dvb_attach(tda10046_attach,
                                                &philips_tu1216_61_config,
                                                &dev->i2c_adap);
-                if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_init;
-                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_tda6651_pll_set;
+                if (fe0->dvb.frontend) {
+                        fe0->dvb.frontend->ops.tuner_ops.init = philips_tu1216_init;
+                        fe0->dvb.frontend->ops.tuner_ops.set_params = philips_tda6651_pll_set;
                 }
                 break;
         case SAA7134_BOARD_KWORLD_DVBT_210:
@@ -1060,20 +1070,20 @@ static int dvb_init(struct saa7134_dev *dev)
                                          &tda827x_cfg_0) < 0)
                         goto dettach_frontend;
                 break;
-        case SAA7134_BOARD_FLYDVB_TRIO:
+        case SAA7134_BOARD_FLYDVB_TRIO: // XXXXXX multifrontend
                 if (!use_frontend) {    /* terrestrial */
                         if (configure_tda827x_fe(dev, &lifeview_trio_config,
                                                  &tda827x_cfg_0) < 0)
                                 goto dettach_frontend;
                 } else {                /* satellite */
-                        dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap);
-                        if (dev->dvb.frontend) {
-                                if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x63,
+                        fe0->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap);
+                        if (fe0->dvb.frontend) {
+                                if (dvb_attach(tda826x_attach, fe0->dvb.frontend, 0x63,
                                                                         &dev->i2c_adap, 0) == NULL) {
                                         wprintk("%s: Lifeview Trio, No tda826x found!\n", __func__);
                                         goto dettach_frontend;
                                 }
-                                if (dvb_attach(isl6421_attach, dev->dvb.frontend, &dev->i2c_adap,
+                                if (dvb_attach(isl6421_attach, fe0->dvb.frontend, &dev->i2c_adap,
                                                                                 0x08, 0, 0) == NULL) {
                                         wprintk("%s: Lifeview Trio, No ISL6421 found!\n", __func__);
                                         goto dettach_frontend;
@@ -1083,11 +1093,11 @@ static int dvb_init(struct saa7134_dev *dev)
                 break;
         case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331:
         case SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS:
-                dev->dvb.frontend = dvb_attach(tda10046_attach,
+                fe0->dvb.frontend = dvb_attach(tda10046_attach,
                                                &ads_tech_duo_config,
                                                &dev->i2c_adap);
-                if (dev->dvb.frontend) {
-                        if (dvb_attach(tda827x_attach,dev->dvb.frontend,
+                if (fe0->dvb.frontend) {
+                        if (dvb_attach(tda827x_attach,fe0->dvb.frontend,
                                    ads_tech_duo_config.tuner_address, &dev->i2c_adap,
                                                                 &ads_duo_cfg) == NULL) {
                                 wprintk("no tda827x tuner found at addr: %02x\n",
@@ -1108,15 +1118,15 @@ static int dvb_init(struct saa7134_dev *dev)
                                                  &tda827x_cfg_0) < 0)
                                 goto dettach_frontend;
                 } else {        /* satellite */
-                        dev->dvb.frontend = dvb_attach(tda10086_attach,
+                        fe0->dvb.frontend = dvb_attach(tda10086_attach,
                                                         &flydvbs, &dev->i2c_adap);
-                        if (dev->dvb.frontend) {
-                                struct dvb_frontend *fe = dev->dvb.frontend;
+                        if (fe0->dvb.frontend) {
+                                struct dvb_frontend *fe = fe0->dvb.frontend;
                                 u8 dev_id = dev->eedata[2];
                                 u8 data = 0xc4;
                                 struct i2c_msg msg = {.addr = 0x08, .flags = 0, .len = 1};
 
-                                if (dvb_attach(tda826x_attach, dev->dvb.frontend,
+                                if (dvb_attach(tda826x_attach, fe0->dvb.frontend,
                                                 0x60, &dev->i2c_adap, 0) == NULL) {
                                         wprintk("%s: Medion Quadro, no tda826x "
                                                 "found !\n", __func__);
@@ -1150,31 +1160,31 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
-                dev->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180,
+                fe0->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180,
                                                &dev->i2c_adap);
-                if (dev->dvb.frontend)
-                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
+                if (fe0->dvb.frontend)
+                        dvb_attach(dvb_pll_attach, fe0->dvb.frontend, 0x61,
                                    NULL, DVB_PLL_TDHU2);
                 break;
         case SAA7134_BOARD_ADS_INSTANT_HDTV_PCI:
         case SAA7134_BOARD_KWORLD_ATSC110:
-                dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110,
+                fe0->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110,
                                                &dev->i2c_adap);
-                if (dev->dvb.frontend)
-                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                if (fe0->dvb.frontend)
+                        dvb_attach(simple_tuner_attach, fe0->dvb.frontend,
                                    &dev->i2c_adap, 0x61,
                                    TUNER_PHILIPS_TUV1236D);
                 break;
         case SAA7134_BOARD_FLYDVBS_LR300:
-                dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs,
+                fe0->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs,
                                                &dev->i2c_adap);
-                if (dev->dvb.frontend) {
-                        if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x60,
+                if (fe0->dvb.frontend) {
+                        if (dvb_attach(tda826x_attach, fe0->dvb.frontend, 0x60,
                                        &dev->i2c_adap, 0) == NULL) {
                                 wprintk("%s: No tda826x found!\n", __func__);
                                 goto dettach_frontend;
                         }
-                        if (dvb_attach(isl6421_attach, dev->dvb.frontend,
+                        if (dvb_attach(isl6421_attach, fe0->dvb.frontend,
                                        &dev->i2c_adap, 0x08, 0, 0) == NULL) {
                                 wprintk("%s: No ISL6421 found!\n", __func__);
                                 goto dettach_frontend;
@@ -1182,25 +1192,25 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:
-                dev->dvb.frontend = dvb_attach(tda10046_attach,
+                fe0->dvb.frontend = dvb_attach(tda10046_attach,
                                                &medion_cardbus,
                                                &dev->i2c_adap);
-                if (dev->dvb.frontend) {
-                        dev->original_demod_sleep = dev->dvb.frontend->ops.sleep;
-                        dev->dvb.frontend->ops.sleep = philips_europa_demod_sleep;
+                if (fe0->dvb.frontend) {
+                        dev->original_demod_sleep = fe0->dvb.frontend->ops.sleep;
+                        fe0->dvb.frontend->ops.sleep = philips_europa_demod_sleep;
 
-                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                        dvb_attach(simple_tuner_attach, fe0->dvb.frontend,
                                    &dev->i2c_adap, medion_cardbus.tuner_address,
                                    TUNER_PHILIPS_FMD1216ME_MK3);
                 }
                 break;
         case SAA7134_BOARD_VIDEOMATE_DVBT_200A:
-                dev->dvb.frontend = dvb_attach(tda10046_attach,
+                fe0->dvb.frontend = dvb_attach(tda10046_attach,
                                 &philips_europa_config,
                                 &dev->i2c_adap);
-                if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops.tuner_ops.init = philips_td1316_tuner_init;
-                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_td1316_tuner_set_params;
+                if (fe0->dvb.frontend) {
+                        fe0->dvb.frontend->ops.tuner_ops.init = philips_td1316_tuner_init;
+                        fe0->dvb.frontend->ops.tuner_ops.set_params = philips_td1316_tuner_set_params;
                 }
                 break;
         case SAA7134_BOARD_CINERGY_HT_PCMCIA:
@@ -1239,15 +1249,15 @@ static int dvb_init(struct saa7134_dev *dev)
                         goto dettach_frontend;
                 break;
         case SAA7134_BOARD_PHILIPS_SNAKE:
-                dev->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs,
+                fe0->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs,
                                                 &dev->i2c_adap);
-                if (dev->dvb.frontend) {
-                        if (dvb_attach(tda826x_attach, dev->dvb.frontend, 0x60,
+                if (fe0->dvb.frontend) {
+                        if (dvb_attach(tda826x_attach, fe0->dvb.frontend, 0x60,
                                         &dev->i2c_adap, 0) == NULL) {
                                 wprintk("%s: No tda826x found!\n", __func__);
                                 goto dettach_frontend;
                         }
-                        if (dvb_attach(lnbp21_attach, dev->dvb.frontend,
+                        if (dvb_attach(lnbp21_attach, fe0->dvb.frontend,
                                         &dev->i2c_adap, 0, 0) == NULL) {
                                 wprintk("%s: No lnbp21 found!\n", __func__);
                                 goto dettach_frontend;
@@ -1269,24 +1279,24 @@ static int dvb_init(struct saa7134_dev *dev)
                 saa7134_set_gpio(dev, 25, 0);
                 msleep(10);
                 saa7134_set_gpio(dev, 25, 1);
-                dev->dvb.frontend = dvb_attach(mt352_attach,
+                fe0->dvb.frontend = dvb_attach(mt352_attach,
                                                 &avermedia_xc3028_mt352_dev,
                                                 &dev->i2c_adap);
                 attach_xc3028 = 1;
                 break;
         case SAA7134_BOARD_MD7134_BRIDGE_2:
-                dev->dvb.frontend = dvb_attach(tda10086_attach,
+                fe0->dvb.frontend = dvb_attach(tda10086_attach,
                                                 &sd1878_4m, &dev->i2c_adap);
-                if (dev->dvb.frontend) {
+                if (fe0->dvb.frontend) {
                         struct dvb_frontend *fe;
-                        if (dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
+                        if (dvb_attach(dvb_pll_attach, fe0->dvb.frontend, 0x60,
                                   &dev->i2c_adap, DVB_PLL_PHILIPS_SD1878_TDA8261) == NULL) {
                                 wprintk("%s: MD7134 DVB-S, no SD1878 "
                                         "found !\n", __func__);
                                 goto dettach_frontend;
                         }
                         /* we need to open the i2c gate (we know it exists) */
-                        fe = dev->dvb.frontend;
+                        fe = fe0->dvb.frontend;
                         fe->ops.i2c_gate_ctrl(fe, 1);
                         if (dvb_attach(isl6405_attach, fe,
                                         &dev->i2c_adap, 0x08, 0, 0) == NULL) {
@@ -1305,7 +1315,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 saa7134_set_gpio(dev, 25, 0);
                 msleep(10);
                 saa7134_set_gpio(dev, 25, 1);
-                dev->dvb.frontend = dvb_attach(mt352_attach,
+                fe0->dvb.frontend = dvb_attach(mt352_attach,
                                                 &avermedia_xc3028_mt352_dev,
                                                 &dev->i2c_adap);
                 attach_xc3028 = 1;
@@ -1316,17 +1326,17 @@ static int dvb_init(struct saa7134_dev *dev)
                                                         &tda827x_cfg_2) < 0)
                                 goto dettach_frontend;
                 } else {                /* satellite */
-                        dev->dvb.frontend = dvb_attach(tda10086_attach,
+                        fe0->dvb.frontend = dvb_attach(tda10086_attach,
                                                 &flydvbs, &dev->i2c_adap);
-                        if (dev->dvb.frontend) {
+                        if (fe0->dvb.frontend) {
                                 if (dvb_attach(tda826x_attach,
-                                                dev->dvb.frontend, 0x60,
+                                                fe0->dvb.frontend, 0x60,
                                                 &dev->i2c_adap, 0) == NULL) {
                                         wprintk("%s: Asus Tiger 3in1, no "
                                                 "tda826x found!\n", __func__);
                                         goto dettach_frontend;
                                 }
-                                if (dvb_attach(lnbp21_attach, dev->dvb.frontend,
+                                if (dvb_attach(lnbp21_attach, fe0->dvb.frontend,
                                                 &dev->i2c_adap, 0, 0) == NULL) {
                                         wprintk("%s: Asus Tiger 3in1, no lnbp21"
                                                 " found!\n", __func__);
@@ -1352,10 +1362,10 @@ static int dvb_init(struct saa7134_dev *dev)
                         .i2c_addr  = 0x61,
                 };
 
-                if (!dev->dvb.frontend)
+                if (!fe0->dvb.frontend)
                         return -1;
 
-                fe = dvb_attach(xc2028_attach, dev->dvb.frontend, &cfg);
+                fe = dvb_attach(xc2028_attach, fe0->dvb.frontend, &cfg);
                 if (!fe) {
                         printk(KERN_ERR "%s/2: xc3028 attach failed\n",
                                dev->name);
@@ -1363,40 +1373,47 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
         }
 
-        if (NULL == dev->dvb.frontend) {
+        if (NULL == fe0->dvb.frontend) {
                 printk(KERN_ERR "%s/dvb: frontend initialization failed\n", dev->name);
                 return -1;
         }
         /* define general-purpose callback pointer */
-        dev->dvb.frontend->callback = saa7134_tuner_callback;
+        fe0->dvb.frontend->callback = saa7134_tuner_callback;
 
         /* register everything else */
-        ret = videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev, &dev->pci->dev,
-                                    adapter_nr);
+        ret = videobuf_dvb_register_bus(&dev->frontends, THIS_MODULE, dev,
+                &dev->pci->dev, adapter_nr);
 
         /* this sequence is necessary to make the tda1004x load its firmware
          * and to enter analog mode of hybrid boards
          */
         if (!ret) {
-                if (dev->dvb.frontend->ops.init)
-                        dev->dvb.frontend->ops.init(dev->dvb.frontend);
-                if (dev->dvb.frontend->ops.sleep)
-                        dev->dvb.frontend->ops.sleep(dev->dvb.frontend);
-                if (dev->dvb.frontend->ops.tuner_ops.sleep)
-                        dev->dvb.frontend->ops.tuner_ops.sleep(dev->dvb.frontend);
+                if (fe0->dvb.frontend->ops.init)
+                        fe0->dvb.frontend->ops.init(fe0->dvb.frontend);
+                if (fe0->dvb.frontend->ops.sleep)
+                        fe0->dvb.frontend->ops.sleep(fe0->dvb.frontend);
+                if (fe0->dvb.frontend->ops.tuner_ops.sleep)
+                        fe0->dvb.frontend->ops.tuner_ops.sleep(fe0->dvb.frontend);
         }
         return ret;
 
 dettach_frontend:
-        if (dev->dvb.frontend)
-                dvb_frontend_detach(dev->dvb.frontend);
-        dev->dvb.frontend = NULL;
+        if (fe0->dvb.frontend)
+                dvb_frontend_detach(fe0->dvb.frontend);
+        fe0->dvb.frontend = NULL;
 
         return -1;
 }
 
 static int dvb_fini(struct saa7134_dev *dev)
 {
+        struct videobuf_dvb_frontend *fe0;
+
+        /* Get the first frontend */
+        fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1);
+        if (!fe0)
+                return -EINVAL;
+
         /* FIXME: I suspect that this code is bogus, since the entry for
            Pinnacle 300I DVB-T PAL already defines the proper init to allow
            the detection of mt2032 (TDA9887_PORT2_INACTIVE)
@@ -1416,7 +1433,7 @@ static int dvb_fini(struct saa7134_dev *dev)
                         u8 data = 0x80;
                         struct i2c_msg msg = {.addr = 0x08, .buf = &data, .flags = 0, .len = 1};
                         struct dvb_frontend *fe;
-                        fe = dev->dvb.frontend;
+                        fe = fe0->dvb.frontend;
                         if (fe->ops.i2c_gate_ctrl) {
                                 fe->ops.i2c_gate_ctrl(fe, 1);
                                 i2c_transfer(&dev->i2c_adap, &msg, 1);
@@ -1424,8 +1441,8 @@ static int dvb_fini(struct saa7134_dev *dev)
                         }
                 }
         }
-        if (dev->dvb.frontend)
-                videobuf_dvb_unregister(&dev->dvb);
+        if (fe0->dvb.frontend)
+                videobuf_dvb_unregister_bus(&dev->frontends);
         return 0;
 }
 
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 491ab1f8fdd3..24096d6e1ef8 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -581,7 +581,7 @@ struct saa7134_dev {
 
 #if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)
         /* SAA7134_MPEG_DVB only */
-        struct videobuf_dvb        dvb;
+        struct videobuf_dvb_frontends frontends;
         int (*original_demod_sleep)(struct dvb_frontend *fe);
         int (*original_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage);
         int (*original_set_high_voltage)(struct dvb_frontend *fe, long arg);