diff options
author | Andrew de Quincey <adq_dvb@lidskialf.net> | 2006-08-08 08:10:09 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 10:53:29 -0400 |
commit | 0912ad0b0fdee374f1f49d75fee341980f0868b6 (patch) | |
tree | 9845dc4c6e64d7964f1e7d3bcb7606a128f51711 /drivers/media/dvb/bt8xx/dst_ca.c | |
parent | f52a838b74be70b4054ab27e435e9acb92d8c50a (diff) |
V4L/DVB (4392): Fix dst_ca attach
Move the call to dst_attach into the dst_attach function to eliminate
problems caused with dvb_attach.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Acked-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/bt8xx/dst_ca.c')
-rw-r--r-- | drivers/media/dvb/bt8xx/dst_ca.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c index c4ff1abc15c3..df0f68fbf24b 100644 --- a/drivers/media/dvb/bt8xx/dst_ca.c +++ b/drivers/media/dvb/bt8xx/dst_ca.c | |||
@@ -699,12 +699,11 @@ static struct dvb_device dvbdev_ca = { | |||
699 | .fops = &dst_ca_fops | 699 | .fops = &dst_ca_fops |
700 | }; | 700 | }; |
701 | 701 | ||
702 | ssize_t dst_ca_attach(struct dst_state *dst, struct dvb_adapter *dvb_adapter) | 702 | void dst_ca_attach(struct dst_state *dst, struct dvb_adapter *dvb_adapter) |
703 | { | 703 | { |
704 | struct dvb_device *dvbdev; | 704 | struct dvb_device *dvbdev; |
705 | dprintk(verbose, DST_CA_ERROR, 1, "registering DST-CA device"); | 705 | dprintk(verbose, DST_CA_ERROR, 1, "registering DST-CA device"); |
706 | dvb_register_device(dvb_adapter, &dvbdev, &dvbdev_ca, dst, DVB_DEVICE_CA); | 706 | dvb_register_device(dvb_adapter, &dvbdev, &dvbdev_ca, dst, DVB_DEVICE_CA); |
707 | return 1; // must return non-zero for dvb_attach() to work | ||
708 | } | 707 | } |
709 | 708 | ||
710 | EXPORT_SYMBOL(dst_ca_attach); | 709 | EXPORT_SYMBOL(dst_ca_attach); |