diff options
| author | Manu Abraham <abraham.manu@gmail.com> | 2006-08-08 20:48:08 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 16:53:37 +0200 |
| commit | bbdd11fa957913d6648cabbca59be1da479180ed (patch) | |
| tree | 48d00e950c54a6cb1d04c3eba4e742a0c829ad9e /drivers/media/dvb/bt8xx/dvb-bt8xx.c | |
| parent | V4L/DVB (4428): Fix tda826x detection (diff) | |
| download | linux-bbdd11fa957913d6648cabbca59be1da479180ed.tar.xz linux-bbdd11fa957913d6648cabbca59be1da479180ed.zip | |
V4L/DVB (4432): Fix Circular dependencies
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/bt8xx/dvb-bt8xx.c')
| -rw-r--r-- | drivers/media/dvb/bt8xx/dvb-bt8xx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c index a19991f7af47..fb6c4cc8477d 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c @@ -669,13 +669,17 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) state->config = &dst_config; state->i2c = card->i2c_adapter; state->bt = card->bt; - + state->dst_ca = NULL; /* DST is not a frontend, attaching the ASIC */ if (dvb_attach(dst_attach, state, &card->dvb_adapter) == NULL) { printk("%s: Could not find a Twinhan DST.\n", __FUNCTION__); break; } + /* Attach other DST peripherals if any */ + /* Conditional Access device */ card->fe = &state->frontend; + if (state->dst_hw_cap & DST_TYPE_HAS_CA) + dvb_attach(dst_ca_attach, state, &card->dvb_adapter); break; case BTTV_BOARD_PINNACLESAT: |