aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-04 03:35:07 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 08:55:42 -0500
commit42f541bfd1a9bad84a288d59a98fdb284df61a45 (patch)
treecb32b61129450d5228d3c6d83233956bf978765e /drivers/media
parent99b55b2c4478e6370aaa85173f5090a070c50a08 (diff)
V4L/DVB (13790): [Mantis] Relocate queue initialization
Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/mantis/mantis_ca.c4
-rw-r--r--drivers/media/dvb/mantis/mantis_hif.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/dvb/mantis/mantis_ca.c b/drivers/media/dvb/mantis/mantis_ca.c
index 53c01b3023cc..7aa27e0703b8 100644
--- a/drivers/media/dvb/mantis/mantis_ca.c
+++ b/drivers/media/dvb/mantis/mantis_ca.c
@@ -158,6 +158,10 @@ int mantis_ca_init(struct mantis_pci *mantis)
158 158
159 mutex_init(&ca->ca_lock); 159 mutex_init(&ca->ca_lock);
160 160
161 init_waitqueue_head(&ca->hif_data_wq);
162 init_waitqueue_head(&ca->hif_opdone_wq);
163 init_waitqueue_head(&ca->hif_write_wq);
164
161 dprintk(verbose, MANTIS_ERROR, 1, "Registering EN50221 device"); 165 dprintk(verbose, MANTIS_ERROR, 1, "Registering EN50221 device");
162 if ((result = dvb_ca_en50221_init(dvb_adapter, &ca->en50221, ca_flags, 1)) != 0) { 166 if ((result = dvb_ca_en50221_init(dvb_adapter, &ca->en50221, ca_flags, 1)) != 0) {
163 dprintk(verbose, MANTIS_ERROR, 1, "EN50221: Initialization failed"); 167 dprintk(verbose, MANTIS_ERROR, 1, "EN50221: Initialization failed");
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index b1e1aa0f5c12..99a9724cbaff 100644
--- a/drivers/media/dvb/mantis/mantis_hif.c
+++ b/drivers/media/dvb/mantis/mantis_hif.c
@@ -209,9 +209,6 @@ int mantis_hif_init(struct mantis_ca *ca)
209 209
210 slot[0].slave_cfg = 0x70773028; 210 slot[0].slave_cfg = 0x70773028;
211 dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Initializing Mantis Host Interface", mantis->num); 211 dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Initializing Mantis Host Interface", mantis->num);
212 init_waitqueue_head(&ca->hif_data_wq);
213 init_waitqueue_head(&ca->hif_opdone_wq);
214 init_waitqueue_head(&ca->hif_write_wq);
215 212
216 mutex_lock(&ca->ca_lock); 213 mutex_lock(&ca->ca_lock);
217 irqcfg = mmread(MANTIS_GPIF_IRQCFG); 214 irqcfg = mmread(MANTIS_GPIF_IRQCFG);