From patchwork Tue Mar 9 22:48:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Niebuhr X-Patchwork-Id: 84611 Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2AEdNHW003441 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Mar 2010 14:39:59 GMT Received: from dlep33.itg.ti.com ([157.170.170.112]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o2AEZaa4013278 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 10 Mar 2010 08:35:38 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id o2AEZYMQ016484; Wed, 10 Mar 2010 08:35:34 -0600 (CST) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id E7F388062B; Wed, 10 Mar 2010 08:35:33 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id D9DAC80626 for ; Tue, 9 Mar 2010 16:48:39 -0600 (CST) Received: from medina.ext.ti.com (localhost [127.0.0.1]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id o29Mmd4M017602 for ; Tue, 9 Mar 2010 16:48:39 -0600 (CST) Received: from psmtp.com (na3sys009amx255.postini.com [74.125.149.139]) by medina.ext.ti.com (8.13.7/8.13.7) with SMTP id o29MmcSo014437 for ; Tue, 9 Mar 2010 16:48:39 -0600 Received: from source ([209.85.217.216]) by na3sys009amx255.postini.com ([74.125.148.10]) with SMTP; Tue, 09 Mar 2010 22:48:39 GMT Received: by gxk8 with SMTP id 8so3679333gxk.9 for ; Tue, 09 Mar 2010 14:48:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=pevxC+hFCBELHdDJZUMPuEZ42OReyFInmqXiT28j4cU=; b=dm6cSqPc3v0kqTLqOuLD1GLzpFtorJQFcLkK4lOhnhKKBl5BpL7Kc20bsLeXqwGU19 yxenZhsTU+8k0l5VxoJlcsdxkOsdtYszr7VmRWHiy7c+YKpjmknNYwkS5O5YxLVkYud7 AsflcmYLqKCuDv66ZP8gsxDflcGuAdhl+qTWE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=i+dghlMW+Ri2qqIx7XiCdGrKSPZ+fUpuNAgsQcb/pFyoK8Hnx9VfREHIg8apwfu7w2 vaM8DhUXCPTVZY61l0eLySYJjaF46AgnmYW4eTk5v2aJl7ZKVsgsGXpJqifbT5/xJ5jZ Zdjt81j7UpD+J7Bshflrc1PRumQff8Mnv2szk= Received: by 10.101.53.2 with SMTP id f2mr217242ank.23.1268174918080; Tue, 09 Mar 2010 14:48:38 -0800 (PST) Received: from localhost.localdomain (h197.252.190.173.static.ip.windstream.net [173.190.252.197]) by mx.google.com with ESMTPS id 13sm4677283gxk.8.2010.03.09.14.48.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 09 Mar 2010 14:48:36 -0800 (PST) From: Brian Niebuhr To: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH] davinci: edma: clear events in edma_start() Date: Tue, 9 Mar 2010 16:48:03 -0600 Message-Id: <1268174883-13933-1-git-send-email-bniebuhr@efjohnson.com> X-Mailer: git-send-email 1.6.3.3 X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:65.57962/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.5000) s cv gt3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] X-Mailman-Approved-At: Wed, 10 Mar 2010 08:35:30 -0600 Cc: Brian Niebuhr X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 10 Mar 2010 14:39:59 +0000 (UTC) diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c index 5cd48fa..52c16ff 100644 --- a/arch/arm/mach-davinci/dma.c +++ b/arch/arm/mach-davinci/dma.c @@ -1290,7 +1290,8 @@ int edma_start(unsigned channel) /* EDMA channel with event association */ pr_debug("EDMA: ER%d %08x\n", j, edma_shadow0_read_array(ctlr, SH_ER, j)); - /* Clear any pending error */ + /* Clear any pending event or error */ + edma_write_array(ctlr, EDMA_ECR, j, mask); edma_write_array(ctlr, EDMA_EMCR, j, mask); /* Clear any SER */ edma_shadow0_write_array(ctlr, SH_SECR, j, mask);