From patchwork Sat Jan 9 13:55:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roel Kluin X-Patchwork-Id: 71928 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o09DpdSK032599 for ; Sat, 9 Jan 2010 13:51:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754594Ab0AINvN (ORCPT ); Sat, 9 Jan 2010 08:51:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754553Ab0AINvM (ORCPT ); Sat, 9 Jan 2010 08:51:12 -0500 Received: from ey-out-2122.google.com ([74.125.78.24]:17936 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752874Ab0AINvM (ORCPT ); Sat, 9 Jan 2010 08:51:12 -0500 Received: by ey-out-2122.google.com with SMTP id 22so1457955eye.19 for ; Sat, 09 Jan 2010 05:51:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:content-type :content-transfer-encoding; bh=ls0xKUWwCfZtFAH9oosiHgz8jnoZSRhdsX58kiN91Ak=; b=uQnJkHffb4uhttdF2K+YwEfZNwxiKiVD8qg5K1bSl1u6IWqG9rfXLRhXtFmI6X/lzr 5dsep3xAfMs6paVl7EkpJAud7D1tBjWoiW22iUesNdmVAp7hVgV+j4+tv9Ox9IIvjYSk 6vnd0unWueMlflRbxFINpovc+ixA+mYF5CyXo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; b=sfJ4DaZZ8iL9vv4NAIBG79S1SXR9G/5giYcr51WZpgJp+BrC4Wx+ooJ416Othjl4EG igrvOt4E6lFrjLJuY0dudTJJt69IDHNIshVqd7wQVlut3HdypZu3qbQrm33ukEOZ7pmA 0B/bs8k79FkaVeqpR/xsaHMfplcXdyG4Mw4qQ= Received: by 10.213.0.139 with SMTP id 11mr4536435ebb.86.1263045069055; Sat, 09 Jan 2010 05:51:09 -0800 (PST) Received: from zoinx.mars (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 10sm3204894eyz.39.2010.01.09.05.51.07 (version=SSLv3 cipher=RC4-MD5); Sat, 09 Jan 2010 05:51:08 -0800 (PST) Message-ID: <4B488ABF.4070403@gmail.com> Date: Sat, 09 Jan 2010 14:55:11 +0100 From: Roel Kluin User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091209 Fedora/3.0-4.fc12 Thunderbird/3.0 MIME-Version: 1.0 To: Tony Lindgren , "linux-omap@vger.kernel.org" , Andrew Morton , LKML Subject: [PATCH] OMAP: dma_chan[lch_head].flag & OMAP_DMA_ACTIVE tested twice in omap_dma_unlink_lch() Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 09d82b3..728c642 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -1183,7 +1183,7 @@ void omap_dma_unlink_lch(int lch_head, int lch_queue) } if ((dma_chan[lch_head].flags & OMAP_DMA_ACTIVE) || - (dma_chan[lch_head].flags & OMAP_DMA_ACTIVE)) { + (dma_chan[lch_queue].flags & OMAP_DMA_ACTIVE)) { printk(KERN_ERR "omap_dma: You need to stop the DMA channels " "before unlinking\n"); dump_stack();