V4L/DVB (13790): [Mantis] Relocate queue initialization

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/mantis/mantis_ca.c b/drivers/media/dvb/mantis/mantis_ca.c
index 53c01b3023ccb228997814659f61c894f3eff437..7aa27e0703b89967e4e0fdac01bedef84bba1df5 100644 (file)
--- 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 b1e1aa0f5c127453f59dfa91f0036e338a58b999..99a9724cbaff24fba1a6eb1f2399e9b138a5acd7 100644 (file)
--- 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);