diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2008-09-06 13:56:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:37:01 -0400 |
commit | 30650961907368b1077cade35455fe931b14da6b (patch) | |
tree | a27bbcb9319529b6d13da933adff4c069a12b853 /drivers/media/video/cx23885 | |
parent | 2a6003c20771ca16fc6386b5fd258df2f2fa8232 (diff) |
V4L/DVB (8951): xc5000: dont pass devptr in xc5000_attach()
Dont pass devptr in xc5000_attach, dont store it in xc5000_priv.
This pointer is passed into the tuner_callback function, which always
expects a pointer to fe->dvb->priv or i2c_adapter->algo_data.
This prevents future possible bugs in new drivers, such as using a "devptr"
other that the standard fe->dvb->priv in a DVB driver.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-dvb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index b85cb39b101d..f462efde72ad 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c | |||
@@ -390,8 +390,8 @@ static int dvb_register(struct cx23885_tsport *port) | |||
390 | &dev->i2c_bus[0].i2c_adap); | 390 | &dev->i2c_bus[0].i2c_adap); |
391 | if (port->dvb.frontend != NULL) | 391 | if (port->dvb.frontend != NULL) |
392 | dvb_attach(xc5000_attach, port->dvb.frontend, | 392 | dvb_attach(xc5000_attach, port->dvb.frontend, |
393 | &i2c_bus->i2c_adap, | 393 | &i2c_bus->i2c_adap, |
394 | &hauppauge_hvr1500q_tunerconfig, port); | 394 | &hauppauge_hvr1500q_tunerconfig); |
395 | break; | 395 | break; |
396 | case CX23885_BOARD_HAUPPAUGE_HVR1500: | 396 | case CX23885_BOARD_HAUPPAUGE_HVR1500: |
397 | i2c_bus = &dev->i2c_bus[1]; | 397 | i2c_bus = &dev->i2c_bus[1]; |
@@ -471,8 +471,8 @@ static int dvb_register(struct cx23885_tsport *port) | |||
471 | &i2c_bus->i2c_adap); | 471 | &i2c_bus->i2c_adap); |
472 | if (port->dvb.frontend != NULL) | 472 | if (port->dvb.frontend != NULL) |
473 | dvb_attach(xc5000_attach, port->dvb.frontend, | 473 | dvb_attach(xc5000_attach, port->dvb.frontend, |
474 | &i2c_bus->i2c_adap, | 474 | &i2c_bus->i2c_adap, |
475 | &dvico_xc5000_tunerconfig, port); | 475 | &dvico_xc5000_tunerconfig); |
476 | break; | 476 | break; |
477 | case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP: { | 477 | case CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP: { |
478 | i2c_bus = &dev->i2c_bus[port->nr - 1]; | 478 | i2c_bus = &dev->i2c_bus[port->nr - 1]; |