From patchwork Sun Jun 20 11:37:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marko Ristola X-Patchwork-Id: 107046 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5KBbVwa008576 for ; Sun, 20 Jun 2010 11:37:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752177Ab0FTLha (ORCPT ); Sun, 20 Jun 2010 07:37:30 -0400 Received: from emh03.mail.saunalahti.fi ([62.142.5.109]:55787 "EHLO emh03.mail.saunalahti.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752093Ab0FTLha (ORCPT ); Sun, 20 Jun 2010 07:37:30 -0400 Received: from saunalahti-vams (vs3-12.mail.saunalahti.fi [62.142.5.96]) by emh03-2.mail.saunalahti.fi (Postfix) with SMTP id 109AEEBB18; Sun, 20 Jun 2010 14:37:28 +0300 (EEST) Received: from emh01.mail.saunalahti.fi ([62.142.5.107]) by vs3-12.mail.saunalahti.fi ([62.142.5.96]) with SMTP (gateway) id A06151EE484; Sun, 20 Jun 2010 14:37:27 +0300 Received: from tammi.koti (a88-114-153-83.elisa-laajakaista.fi [88.114.153.83]) by emh01.mail.saunalahti.fi (Postfix) with ESMTP id D4F4A4035; Sun, 20 Jun 2010 14:37:25 +0300 (EEST) Message-ID: <4C1DFD75.3080606@kolumbus.fi> Date: Sun, 20 Jun 2010 14:37:25 +0300 From: Marko Ristola User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100430 Fedora/3.0.4-3.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: linux-media@vger.kernel.org Subject: [PATCH] Mantis: append tasklet maintenance for DVB stream delivery X-Antivirus: VAMS Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 20 Jun 2010 11:37:32 +0000 (UTC) diff --git a/drivers/media/dvb/mantis/mantis_dma.c b/drivers/media/dvb/mantis/mantis_dma.c index 46202a4..cf502a6 100644 --- a/drivers/media/dvb/mantis/mantis_dma.c +++ b/drivers/media/dvb/mantis/mantis_dma.c @@ -217,12 +217,14 @@ void mantis_dma_start(struct mantis_pci *mantis) mmwrite(MANTIS_FIFO_EN | MANTIS_DCAP_EN | MANTIS_RISC_EN, MANTIS_DMA_CTL); + tasklet_enable(&mantis->tasklet); } void mantis_dma_stop(struct mantis_pci *mantis) { u32 stat = 0, mask = 0; + tasklet_disable(&mantis->tasklet); stat = mmread(MANTIS_INT_STAT); mask = mmread(MANTIS_INT_MASK); dprintk(MANTIS_DEBUG, 1, "Mantis Stop DMA engine"); diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c index 99d82ee..0c29f01 100644 --- a/drivers/media/dvb/mantis/mantis_dvb.c +++ b/drivers/media/dvb/mantis/mantis_dvb.c @@ -216,6 +216,7 @@ int __devinit mantis_dvb_init(struct mantis_pci *mantis) dvb_net_init(&mantis->dvb_adapter, &mantis->dvbnet, &mantis->demux.dmx); tasklet_init(&mantis->tasklet, mantis_dma_xfer, (unsigned long) mantis); + tasklet_disable_nosync(&mantis->tasklet); if (mantis->hwconfig) {