The patch number 13790 was added via Manu Abraham <m...@linuxtv.org>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Manu Abraham <abraham.m...@gmail.com>
[Mantis] Relocate queue initialization
Signed-off-by: Manu Abraham <m...@linuxtv.org>
---
linux/drivers/media/dvb/mantis/mantis_ca.c | 4 ++++
linux/drivers/media/dvb/mantis/mantis_hif.c | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
diff -r d2389fb538c4 -r 0959a4e2fd15 linux/drivers/media/dvb/mantis/mantis_ca.c
--- a/linux/drivers/media/dvb/mantis/mantis_ca.c Fri Dec 04 12:34:44
2009 +0400
+++ b/linux/drivers/media/dvb/mantis/mantis_ca.c Fri Dec 04 12:35:07
2009 +0400
@@ -162,6 +162,10 @@
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 -r d2389fb538c4 -r 0959a4e2fd15 linux/drivers/media/dvb/mantis/mantis_hif.c
--- a/linux/drivers/media/dvb/mantis/mantis_hif.c Fri Dec 04 12:34:44
2009 +0400
+++ b/linux/drivers/media/dvb/mantis/mantis_hif.c Fri Dec 04 12:35:07
2009 +0400
@@ -209,9 +209,6 @@
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);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/0959a4e2fd15cdb455bea4608d850805902aee23
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
