5 files changed, 12 insertions, 8 deletions

diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index c58365005ac1..8aff70217635 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -509,7 +509,6 @@ static int cxusb_dvico_xc3028_tuner_attach(struct dvb_usb_adapter *adap)
         struct xc2028_config      cfg = {
                 .i2c_adap  = &adap->dev->i2c_adap,
                 .i2c_addr  = 0x61,
-                .video_dev = adap->dev,
                 .callback  = dvico_bluebird_xc2028_callback,
         };
         static struct xc2028_ctrl ctl = {
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 22381de7359e..5549a9d73a5c 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -297,7 +297,6 @@ static int dvb_register(struct cx23885_tsport *port)
                         struct xc2028_config cfg = {
                                 .i2c_adap  = &i2c_bus->i2c_adap,
                                 .i2c_addr  = 0x61,
-                                .video_dev = port,
                                 .callback  = cx23885_hvr1500_xc3028_callback,
                         };
                         static struct xc2028_ctrl ctl = {
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 37ebfcc6be55..bbbde6d7dab9 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -458,7 +458,6 @@ static int attach_xc3028(u8 addr, struct cx8802_dev *dev)
         struct xc2028_config cfg = {
                 .i2c_adap  = &dev->core->i2c_adap,
                 .i2c_addr  = addr,
-                .video_dev = dev->core->i2c_adap.algo_data,
         };
 
         if (!dev->dvb.frontend) {
@@ -780,7 +779,6 @@ static int dvb_register(struct cx8802_dev *dev)
                         struct xc2028_config cfg = {
                                 .i2c_adap  = &dev->core->i2c_adap,
                                 .i2c_addr  = 0x61,
-                                .video_dev = dev->core,
                                 .callback  = cx88_pci_nano_callback,
                         };
                         static struct xc2028_ctrl ctl = {
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 4b936b809d78..225e8f8df1a5 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -419,7 +419,6 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 struct xc2028_config cfg = {
                         .i2c_adap  = t->i2c->adapter,
                         .i2c_addr  = t->i2c->addr,
-                        .video_dev = c->adapter->algo_data,
                         .callback  = t->tuner_callback,
                 };
                 if (!xc2028_attach(&t->fe, &cfg)) {
diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
index a9caae1af49d..0b5ba67a4da5 100644
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -1155,7 +1155,7 @@ struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
         if (debug)
                 printk(KERN_DEBUG "xc2028: Xcv2028/3028 init called!\n");
 
-        if (NULL == cfg || NULL == cfg->video_dev)
+        if (NULL == cfg)
                 return NULL;
 
         if (!fe) {
@@ -1163,13 +1163,19 @@ struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
                 return NULL;
         }
 
-        video_dev = cfg->video_dev;
+        video_dev = cfg->i2c_adap->algo_data;
+
+        if (debug)
+                printk(KERN_DEBUG "xc2028: video_dev =%p\n", video_dev);
 
         mutex_lock(&xc2028_list_mutex);
 
         list_for_each_entry(priv, &xc2028_list, xc2028_list) {
-                if (priv->video_dev == cfg->video_dev) {
+                if (&priv->i2c_props.adap->dev == &cfg->i2c_adap->dev) {
                         video_dev = NULL;
+                        if (debug)
+                                printk(KERN_DEBUG "xc2028: reusing device\n");
+
                         break;
                 }
         }
@@ -1197,6 +1203,9 @@ struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
         fe->tuner_priv = priv;
         priv->count++;
 
+        if (debug)
+                printk(KERN_DEBUG "xc2028: usage count is %i\n", priv->count);
+
         memcpy(&fe->ops.tuner_ops, &xc2028_dvb_tuner_ops,
                sizeof(xc2028_dvb_tuner_ops));