summaryrefslogtreecommitdiff
path: root/drivers/media/video/cx88/cx88-dvb.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-05-10 14:34:09 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-05-14 02:56:46 -0300
commit48723543aff1f46091840222490ded5fe09c0e37 (patch)
treece076b78ecae43f7ae22849277db6d496780cc8b /drivers/media/video/cx88/cx88-dvb.c
parent07c87a833e9ef92280ed24ab85cd4eb49cbca9c0 (diff)
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>
Diffstat (limited to 'drivers/media/video/cx88/cx88-dvb.c')
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 75e2e58349ef..d96173ff1dba 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -816,11 +816,10 @@ static int dvb_register(struct cx8802_dev *dev)
/* tuner_config.video_dev must point to
* i2c_adap.algo_data
*/
- pinnacle_pctv_hd_800i_tuner_config.priv =
- core->i2c_adap.algo_data;
if (!dvb_attach(xc5000_attach, dev->dvb.frontend,
&core->i2c_adap,
- &pinnacle_pctv_hd_800i_tuner_config))
+ &pinnacle_pctv_hd_800i_tuner_config,
+ core->i2c_adap.algo_data))
goto frontend_detach;
}
break;
@@ -878,11 +877,10 @@ static int dvb_register(struct cx8802_dev *dev)
/* tuner_config.video_dev must point to
* i2c_adap.algo_data
*/
- dvico_fusionhdtv7_tuner_config.priv =
- core->i2c_adap.algo_data;
if (!dvb_attach(xc5000_attach, dev->dvb.frontend,
&core->i2c_adap,
- &dvico_fusionhdtv7_tuner_config))
+ &dvico_fusionhdtv7_tuner_config,
+ core->i2c_adap.algo_data))
goto frontend_detach;
}
break;