aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-04 03:20:44 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 08:55:37 -0500
commit2ec9b00bd0386b71c8a84a3990a13ea9656fe8dd (patch)
treedfdc288134580f0c9f76067b14d577aef7c610be
parentbb928a7a21273f67455912f0935ff943ddb35d0c (diff)
V4L/DVB (13758): [Mantis CA] CAM_CONTROL: Use CAMREADY_IRQ event
Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/mantis/mantis_ca.c1
-rw-r--r--drivers/media/dvb/mantis/mantis_evm.c5
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/dvb/mantis/mantis_ca.c b/drivers/media/dvb/mantis/mantis_ca.c
index 2c49f6bae499..abd8855cabf3 100644
--- a/drivers/media/dvb/mantis/mantis_ca.c
+++ b/drivers/media/dvb/mantis/mantis_ca.c
@@ -85,6 +85,7 @@ static int mantis_ca_slot_reset(struct dvb_ca_en50221 *en50221, int slot)
85 udelay(500); 85 udelay(500);
86 mmwrite(0x00, MANTIS_PCMCIA_RESET); /* Trailing edge deassert */ 86 mmwrite(0x00, MANTIS_PCMCIA_RESET); /* Trailing edge deassert */
87 msleep(1000); 87 msleep(1000);
88 dvb_ca_en50221_camready_irq(&ca->en50221, 0);
88 89
89 return 0; 90 return 0;
90} 91}
diff --git a/drivers/media/dvb/mantis/mantis_evm.c b/drivers/media/dvb/mantis/mantis_evm.c
index ee049555a3cb..469571508d13 100644
--- a/drivers/media/dvb/mantis/mantis_evm.c
+++ b/drivers/media/dvb/mantis/mantis_evm.c
@@ -82,10 +82,7 @@ static void mantis_hifevm_work(struct work_struct *work)
82 82
83 if (gpif_stat & MANTIS_SBUF_OPDONE) { 83 if (gpif_stat & MANTIS_SBUF_OPDONE) {
84 dprintk(verbose, MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer operation complete", mantis->num); 84 dprintk(verbose, MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer operation complete", mantis->num);
85 if (ca->hif_job_queue) { 85
86 wake_up(&ca->hif_opdone_wq);
87 ca->hif_event = MANTIS_SBUF_OPDONE;
88 }
89 } 86 }
90} 87}
91 88