Commit 42f541bf authored by Manu Abraham's avatar Manu Abraham Committed by Mauro Carvalho Chehab

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

Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 99b55b2c
...@@ -158,6 +158,10 @@ int mantis_ca_init(struct mantis_pci *mantis) ...@@ -158,6 +158,10 @@ int mantis_ca_init(struct mantis_pci *mantis)
mutex_init(&ca->ca_lock); 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"); dprintk(verbose, MANTIS_ERROR, 1, "Registering EN50221 device");
if ((result = dvb_ca_en50221_init(dvb_adapter, &ca->en50221, ca_flags, 1)) != 0) { if ((result = dvb_ca_en50221_init(dvb_adapter, &ca->en50221, ca_flags, 1)) != 0) {
dprintk(verbose, MANTIS_ERROR, 1, "EN50221: Initialization failed"); dprintk(verbose, MANTIS_ERROR, 1, "EN50221: Initialization failed");
......
...@@ -209,9 +209,6 @@ int mantis_hif_init(struct mantis_ca *ca) ...@@ -209,9 +209,6 @@ int mantis_hif_init(struct mantis_ca *ca)
slot[0].slave_cfg = 0x70773028; slot[0].slave_cfg = 0x70773028;
dprintk(verbose, MANTIS_ERROR, 1, "Adapter(%d) Initializing Mantis Host Interface", mantis->num); 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); mutex_lock(&ca->ca_lock);
irqcfg = mmread(MANTIS_GPIF_IRQCFG); irqcfg = mmread(MANTIS_GPIF_IRQCFG);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment