summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-04 05:35:07 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 11:55:42 -0200
commit42f541bfd1a9bad84a288d59a98fdb284df61a45 (patch)
treecb32b61129450d5228d3c6d83233956bf978765e
parent99b55b2c4478e6370aaa85173f5090a070c50a08 (diff)
downloadop-kernel-dev-42f541bfd1a9bad84a288d59a98fdb284df61a45.zip
op-kernel-dev-42f541bfd1a9bad84a288d59a98fdb284df61a45.tar.gz
V4L/DVB (13790): [Mantis] Relocate queue initialization
Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-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 53c01b3..7aa27e0 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)
mutex_init(&ca->ca_lock);
+ init_waitqueue_head(&ca->hif_data_wq);
+ init_waitqueue_head(&ca->hif_opdone_wq);
+ init_waitqueue_head(&ca->hif_write_wq);
+
dprintk(verbose, MANTIS_ERROR, 1, "Registering EN50221 device");
if ((result = dvb_ca_en50221_init(dvb_adapter, &ca->en50221, ca_flags, 1)) != 0) {
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 b1e1aa0..99a9724 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)
slot[0].slave_cfg = 0x70773028;
dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Initializing Mantis Host Interface", mantis->num);
- init_waitqueue_head(&ca->hif_data_wq);
- init_waitqueue_head(&ca->hif_opdone_wq);
- init_waitqueue_head(&ca->hif_write_wq);
mutex_lock(&ca->ca_lock);
irqcfg = mmread(MANTIS_GPIF_IRQCFG);
OpenPOWER on IntegriCloud