---

yaml --- r: 179528 b: refs/heads/master c: 42f541b h: refs/heads/master v: v3
git-mirror · Jan 17, 2010 · 440cb74 · 440cb74
1 parent e62873e
commit 440cb74
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99b55b2c4478e6370aaa85173f5090a070c50a08
+refs/heads/master: 42f541bfd1a9bad84a288d59a98fdb284df61a45
diff --git a/trunk/drivers/media/dvb/mantis/mantis_ca.c b/trunk/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/trunk/drivers/media/dvb/mantis/mantis_hif.c b/trunk/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);