summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/bt8xx/dst.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-07-29 15:41:40 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-07-29 15:41:40 -0300
commit9a9f822910db8450c5478fd7146b5b52088d7aaa (patch)
tree9b588f2096c3b7351e4c127a2c8ffbc8b45a6c55 /linux/drivers/media/dvb/bt8xx/dst.c
parent7272f8f51ed77805115b9716b72ab4b6d3db0049 (diff)
parentf7eb6e544385a7d7a594e4bedb982e39a500a838 (diff)
downloadmediapointer-dvb-s2-9a9f822910db8450c5478fd7146b5b52088d7aaa.tar.gz
mediapointer-dvb-s2-9a9f822910db8450c5478fd7146b5b52088d7aaa.tar.bz2
merge: http://linuxtv.org/hg/~quincy/v4l-dvb-attach
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/bt8xx/dst.c')
-rw-r--r--linux/drivers/media/dvb/bt8xx/dst.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/dst.c b/linux/drivers/media/dvb/bt8xx/dst.c
index d687a14ec..35278d64b 100644
--- a/linux/drivers/media/dvb/bt8xx/dst.c
+++ b/linux/drivers/media/dvb/bt8xx/dst.c
@@ -1756,6 +1756,11 @@ struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad
}
state->frontend.demodulator_priv = state;
+ /* Attach other DST peripherals if any */
+ /* Conditional Access device */
+ if (state->dst_hw_cap & DST_TYPE_HAS_CA)
+ dst_ca_attach(state, dvb_adapter);
+
return state; /* Manu (DST is a card not a frontend) */
}