V4L/DVB (7893): xc5000: bug-fix: allow multiple devices in a single system

The current code passes a context pointer in the xc5000_config struct.
This context pointer is used in the tuner_callback function, used to
reset the device after firmware download.

The xc5000_config struct is a static structure, whose .priv member was
being assigned before calling xc5000_attach().  If there are more than
one of the same device type installed on a single system, the last one
to assign xc5000_config.priv will "win", and all others will cease to
function properly.

This patch passes the context pointer in xc5000_attach() rather that
storing it within the static struct xc5000_config.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c
index 1371b4e4b5f1..c86a5f17eca8 100644
--- a/drivers/media/video/au0828/au0828-dvb.c
+++ b/drivers/media/video/au0828/au0828-dvb.c
@@ -337,12 +337,10 @@ int au0828_dvb_register(struct au0828_dev *dev)
                 dvb->frontend = dvb_attach(au8522_attach,
                                 &hauppauge_hvr950q_config,
                                 &dev->i2c_adap);
-                if (dvb->frontend != NULL) {
-                        hauppauge_hvr950q_tunerconfig.priv = dev;
+                if (dvb->frontend != NULL)
                         dvb_attach(xc5000_attach, dvb->frontend,
                                 &dev->i2c_adap,
-                                &hauppauge_hvr950q_tunerconfig);
-                }
+                                &hauppauge_hvr950q_tunerconfig, dev);
                 break;
         default:
                 printk(KERN_WARNING "The frontend of your DVB/ATSC card "