diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-15 16:22:06 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-15 16:22:06 -0200 |
| commit | 2bd35cda866389fda170f211d63bfd4893a7b464 (patch) | |
| tree | 114fde96970c0a5b073da965b9de4386a6ea7822 /linux/drivers/media/video/cx88/cx88-dvb.c | |
| parent | 213eb0168addbe7f314724f01c9f7ddad3ee2673 (diff) | |
| parent | 7f367712814cef0e1e132c2c39363cb0c6adb557 (diff) | |
| download | mediapointer-dvb-s2-2bd35cda866389fda170f211d63bfd4893a7b464.tar.gz mediapointer-dvb-s2-2bd35cda866389fda170f211d63bfd4893a7b464.tar.bz2 | |
merge http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-dvb.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 5eae5dec2..c4e9177f3 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -476,8 +476,9 @@ static int dvb_register(struct cx8802_dev *dev) break; case CX88_BOARD_DNTV_LIVE_DVB_T_PRO: #if defined(CONFIG_VIDEO_CX88_VP3054) || (defined(CONFIG_VIDEO_CX88_VP3054_MODULE) && defined(MODULE)) + /* MT352 is on a secondary I2C bus made from some GPIO lines */ dev->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_pro_config, - &((struct vp3054_i2c_state *)dev->card_priv)->adap); + &dev->vp3054->adap); if (dev->dvb.frontend != NULL) { dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, &dev->core->i2c_adap, DVB_PLL_FMD1216ME); |