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>

diff --git a/drivers/media/dvb/mantis/mantis_ca.c b/drivers/media/dvb/mantis/mantis_ca.c
index 2c49f6bae4991c8af2cfad40eabbe000f52a7dea..abd8855cabf3eea9dbfe93d10ed2628ee1a9e35a 100644 (file)
--- 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)
        udelay(500);
        mmwrite(0x00, MANTIS_PCMCIA_RESET); /* Trailing edge deassert */
        msleep(1000);
+       dvb_ca_en50221_camready_irq(&ca->en50221, 0);
 
        return 0;
 }

diff --git a/drivers/media/dvb/mantis/mantis_evm.c b/drivers/media/dvb/mantis/mantis_evm.c
index ee049555a3cba861e3a26f6e9638084a069b079e..469571508d13b83453a8f567eb31f105234e2c02 100644 (file)
--- 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)
 
        if (gpif_stat & MANTIS_SBUF_OPDONE) {
                dprintk(verbose, MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): Smart Buffer operation complete", mantis->num);
-               if (ca->hif_job_queue) {
-                       wake_up(&ca->hif_opdone_wq);
-                       ca->hif_event = MANTIS_SBUF_OPDONE;
-               }
+
        }
 }