[media] Remove the double symbol increment hack from drxk_hard

Both ngene and ddbrige calls dvb_attach once for drxk_attach.
The logic used there, and by tda18271c2dd driver is different
from similar logic on other frontends.

The right fix is to change them to use the same logic, but,
while we don't do that, we need to patch em28xx-dvb in order
to do cope with ngene/ddbridge magic.

While here, document why drxk_t_release should do nothing.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c
index d5035586ff62ebd27a6c01469a2a8eefd3b29d99..a0e2ff51263e570e014557c06c07133fe8231cc7 100644 (file)
--- a/drivers/media/dvb/frontends/drxk_hard.c
+++ b/drivers/media/dvb/frontends/drxk_hard.c
@@ -6313,12 +6313,10 @@ static int drxk_c_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend
 
 static void drxk_t_release(struct dvb_frontend *fe)
 {
-#if 0
-       struct drxk_state *state = fe->demodulator_priv;
-
-       dprintk(1, "\n");
-       kfree(state);
-#endif
+       /*
+        * There's nothing to release here, as the state struct
+        * is already freed by drxk_c_release.
+        */
 }
 
 static int drxk_t_init(struct dvb_frontend *fe)
@@ -6451,17 +6449,6 @@ struct dvb_frontend *drxk_attach(const struct drxk_config *config,
                goto error;
        *fe_t = &state->t_frontend;
 
-#ifdef CONFIG_MEDIA_ATTACH
-       /*
-        * HACK: As this function initializes both DVB-T and DVB-C fe symbols,
-        * and calling it twice would create the state twice, leading into
-        * memory leaks, the right way is to call it only once. However, dvb
-        * release functions will call symbol_put twice. So, the solution is to
-        * artificially increment the usage count, in order to allow the
-        * driver to be released.
-        */
-       symbol_get(drxk_attach);
-#endif
        return &state->c_frontend;
 
 error:

diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index f8617d27ab88330ee174d739e6695cdafc547f93..ab8a740bc68cf0c2ce5abf19a335133ccc9e1162 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -76,9 +76,10 @@ struct em28xx_dvb {
        struct dmx_frontend        fe_mem;
        struct dvb_net             net;
 
-       /* Due to DRX-D - probably need changes */
+       /* Due to DRX-K - probably need changes */
        int (*gate_ctrl)(struct dvb_frontend *, int);
        struct semaphore      pll_mutex;
+       bool                    dont_attach_fe1;
 };
 
 
@@ -595,7 +596,7 @@ static void unregister_dvb(struct em28xx_dvb *dvb)
        if (dvb->fe[1])
                dvb_unregister_frontend(dvb->fe[1]);
        dvb_unregister_frontend(dvb->fe[0]);
-       if (dvb->fe[1])
+       if (dvb->fe[1] && !dvb->dont_attach_fe1)
                dvb_frontend_detach(dvb->fe[1]);
        dvb_frontend_detach(dvb->fe[0]);
        dvb_unregister_adapter(&dvb->adapter);
@@ -771,21 +772,22 @@ static int dvb_init(struct em28xx *dev)
        case EM2884_BOARD_TERRATEC_H5:
                terratec_h5_init(dev);
 
-               /* dvb->fe[1] will be DVB-C, and dvb->fe[0] will be DVB-T */
+               dvb->dont_attach_fe1 = 1;
+
                dvb->fe[0] = dvb_attach(drxk_attach, &terratec_h5_drxk, &dev->i2c_adap, &dvb->fe[1]);
-               if (!dvb->fe[0] || !dvb->fe[1]) {
+               if (!dvb->fe[0]) {
                        result = -EINVAL;
                        goto out_free;
                }
+
                /* FIXME: do we need a pll semaphore? */
                dvb->fe[0]->sec_priv = dvb;
                sema_init(&dvb->pll_mutex, 1);
                dvb->gate_ctrl = dvb->fe[0]->ops.i2c_gate_ctrl;
                dvb->fe[0]->ops.i2c_gate_ctrl = drxk_gate_ctrl;
-               dvb->fe[1]->ops.i2c_gate_ctrl = drxk_gate_ctrl;
                dvb->fe[1]->id = 1;
 
-               /* Attach tda18271 */
+               /* Attach tda18271 to DVB-C frontend */
                if (dvb->fe[0]->ops.i2c_gate_ctrl)
                        dvb->fe[0]->ops.i2c_gate_ctrl(dvb->fe[0], 1);
                if (!dvb_attach(tda18271c2dd_attach, dvb->fe[0], &dev->i2c_adap, 0x60)) {
@@ -794,8 +796,12 @@ static int dvb_init(struct em28xx *dev)
                }
                if (dvb->fe[0]->ops.i2c_gate_ctrl)
                        dvb->fe[0]->ops.i2c_gate_ctrl(dvb->fe[0], 0);
-               if (dvb->fe[1]->ops.i2c_gate_ctrl)
-                       dvb->fe[1]->ops.i2c_gate_ctrl(dvb->fe[1], 1);
+
+               /* Hack - needed by drxk/tda18271c2dd */
+               dvb->fe[1]->tuner_priv = dvb->fe[0]->tuner_priv;
+               memcpy(&dvb->fe[1]->ops.tuner_ops,
+                      &dvb->fe[0]->ops.tuner_ops,
+                      sizeof(dvb->fe[0]->ops.tuner_ops));
 
                break;
        default: