Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/media/dvb/mantis/mantis_ca.c

+4 −0
Original line number Diff line number Diff line
@@ -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");

drivers/media/dvb/mantis/mantis_hif.c

+0 −3
Original line number Diff line number Diff line
@@ -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);