V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card
[linux-2.6.git] / drivers / media / video / cx88 / cx88-dvb.c
index 6968ab0..bab2811 100644 (file)
@@ -598,6 +598,11 @@ static int dvb_register(struct cx8802_dev *dev)
        struct videobuf_dvb_frontend *fe0, *fe1 = NULL;
        int mfe_shared = 0; /* bus not shared by default */
 
+       if (0 != core->i2c_rc) {
+               printk(KERN_ERR "%s/2: no i2c-bus available, cannot attach dvb drivers\n", core->name);
+               goto frontend_detach;
+       }
+
        /* Get the first frontend */
        fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1);
        if (!fe0)
@@ -789,7 +794,7 @@ static int dvb_register(struct cx8802_dev *dev)
                if (fe0->dvb.frontend)
                        fe0->dvb.frontend->ops.i2c_gate_ctrl = NULL;
                if (attach_xc3028(0x61, dev) < 0)
-                       return -EINVAL;
+                       goto frontend_detach;
                break;
        case CX88_BOARD_PCHDTV_HD3000:
                fe0->dvb.frontend = dvb_attach(or51132_attach, &pchdtv_hd3000,
@@ -1037,6 +1042,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                0x08, ISL6421_DCL, 0x00);
                }
                break;
+       case CX88_BOARD_TBS_8910:
        case CX88_BOARD_TEVII_S420:
                fe0->dvb.frontend = dvb_attach(stv0299_attach,
                                                &tevii_tuner_sharp_config,
@@ -1058,7 +1064,6 @@ static int dvb_register(struct cx8802_dev *dev)
                                        goto frontend_detach;
                                core->prev_set_voltage = fe0->dvb.frontend->ops.set_voltage;
                                fe0->dvb.frontend->ops.set_voltage = tevii_dvbs_set_voltage;
-
                        }
                }
                break;
@@ -1074,6 +1079,7 @@ static int dvb_register(struct cx8802_dev *dev)
        case CX88_BOARD_OMICOM_SS4_PCI:
        case CX88_BOARD_TBS_8920:
        case CX88_BOARD_PROF_7300:
+       case CX88_BOARD_SATTRADE_ST4200:
                fe0->dvb.frontend = dvb_attach(cx24116_attach,
                                               &hauppauge_hvr4000_config,
                                               &core->i2c_adap);
@@ -1110,10 +1116,7 @@ static int dvb_register(struct cx8802_dev *dev)
                &dev->pci->dev, adapter_nr, mfe_shared);
 
 frontend_detach:
-       if (fe0->dvb.frontend) {
-               dvb_frontend_detach(fe0->dvb.frontend);
-               fe0->dvb.frontend = NULL;
-       }
+       videobuf_dvb_dealloc_frontends(&dev->frontends);
        return -EINVAL;
 }
 
@@ -1198,8 +1201,7 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
 {
        struct cx88_core *core = drv->core;
        struct cx8802_dev *dev = drv->core->dvbdev;
-       int err, i;
-       struct videobuf_dvb_frontend *fe;
+       int err;
 
        dprintk( 1, "%s\n", __func__);
        dprintk( 1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n",
@@ -1215,39 +1217,58 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
        /* If vp3054 isn't enabled, a stub will just return 0 */
        err = vp3054_i2c_probe(dev);
        if (0 != err)
-               goto fail_core;
+               goto fail_probe;
 
        /* dvb stuff */
        printk(KERN_INFO "%s/2: cx2388x based DVB/ATSC card\n", core->name);
        dev->ts_gen_cntrl = 0x0c;
 
-       for (i = 1; i <= core->board.num_frontends; i++) {
-               fe = videobuf_dvb_get_frontend(&core->dvbdev->frontends, i);
-               if (!fe) {
-                       printk(KERN_ERR "%s() failed to get frontend(%d)\n", __func__, i);
-                       continue;
+       err = -ENODEV;
+       if (core->board.num_frontends) {
+               struct videobuf_dvb_frontend *fe;
+               int i;
+
+               for (i = 1; i <= core->board.num_frontends; i++) {
+                       fe = videobuf_dvb_get_frontend(&core->dvbdev->frontends, i);
+                       if (fe == NULL) {
+                               printk(KERN_ERR "%s() failed to get frontend(%d)\n",
+                                       __func__, i);
+                               goto fail_probe;
+                       }
+                       videobuf_queue_sg_init(&fe->dvb.dvbq, &dvb_qops,
+                                   &dev->pci->dev, &dev->slock,
+                                   V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                                   V4L2_FIELD_TOP,
+                                   sizeof(struct cx88_buffer),
+                                   dev);
+                       /* init struct videobuf_dvb */
+                       fe->dvb.name = dev->core->name;
                }
-               videobuf_queue_sg_init(&fe->dvb.dvbq, &dvb_qops,
-                           &dev->pci->dev, &dev->slock,
-                           V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                           V4L2_FIELD_TOP,
-                           sizeof(struct cx88_buffer),
-                           dev);
-               /* init struct videobuf_dvb */
-               fe->dvb.name = dev->core->name;
+       } else {
+               /* no frontends allocated */
+               printk(KERN_ERR "%s/2 .num_frontends should be non-zero\n",
+                       core->name);
+               goto fail_core;
        }
        err = dvb_register(dev);
-       if (err != 0)
+       if (err)
+               /* frontends/adapter de-allocated in dvb_register */
                printk(KERN_ERR "%s/2: dvb_register failed (err = %d)\n",
                       core->name, err);
+       return err;
+fail_probe:
+       videobuf_dvb_dealloc_frontends(&core->dvbdev->frontends);
 fail_core:
        return err;
 }
 
 static int cx8802_dvb_remove(struct cx8802_driver *drv)
 {
+       struct cx88_core *core = drv->core;
        struct cx8802_dev *dev = drv->core->dvbdev;
 
+       dprintk( 1, "%s\n", __func__);
+
        videobuf_dvb_unregister_bus(&dev->frontends);
 
        vp3054_i2c_remove(dev);