| Message ID | 1262802737-6601-28-git-send-email-khilman@deeprootsystems.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show
Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o06IgmTE014837 for <patchwork-davinci@patchwork.kernel.org>; Wed, 6 Jan 2010 18:42:48 GMT Received: from dlep35.itg.ti.com ([157.170.170.118]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o06Ie1u4018322 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 6 Jan 2010 12:40:01 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o06Ie0ZG020621; Wed, 6 Jan 2010 12:40:00 -0600 (CST) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 0DEB180627; Wed, 6 Jan 2010 12:40:00 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id B92158062C for <davinci-linux-open-source@linux.davincidsp.com>; Wed, 6 Jan 2010 12:33:12 -0600 (CST) Received: from medina.ext.ti.com (localhost [127.0.0.1]) by dflp51.itg.ti.com (8.13.7/8.13.7) with ESMTP id o06IXCJc010709 for <davinci-linux-open-source@linux.davincidsp.com>; Wed, 6 Jan 2010 12:33:12 -0600 (CST) Received: from psmtp.com (na3sys009amx235.postini.com [74.125.149.119]) by medina.ext.ti.com (8.13.7/8.13.7) with SMTP id o06IXBZS020210 for <davinci-linux-open-source@linux.davincidsp.com>; Wed, 6 Jan 2010 12:33:12 -0600 Received: from source ([209.85.160.45]) by na3sys009amx235.postini.com ([74.125.148.10]) with SMTP; Wed, 06 Jan 2010 13:33:12 EST Received: by mail-pw0-f45.google.com with SMTP id 1so11617259pwj.24 for <davinci-linux-open-source@linux.davincidsp.com>; Wed, 06 Jan 2010 10:33:11 -0800 (PST) Received: by 10.142.121.3 with SMTP id t3mr16840501wfc.6.1262802791456; Wed, 06 Jan 2010 10:33:11 -0800 (PST) Received: from localhost (deeprootsystems.com [216.254.16.51]) by mx.google.com with ESMTPS id 22sm17146430pzk.2.2010.01.06.10.33.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 06 Jan 2010 10:33:11 -0800 (PST) From: Kevin Hilman <khilman@deeprootsystems.com> To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 27/35] davinci: Correct return value of edma_alloc_channel api Date: Wed, 6 Jan 2010 10:32:09 -0800 Message-Id: <1262802737-6601-28-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.6.rc2.1.g42108 In-Reply-To: <1262802737-6601-27-git-send-email-khilman@deeprootsystems.com> References: <1262802737-6601-1-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-2-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-3-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-4-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-5-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-6-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-7-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-8-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-9-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-10-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-11-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-12-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-13-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-14-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-15-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-16-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-17-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-18-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-19-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-20-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-21-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-22-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-23-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-24-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-25-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-26-git-send-email-khilman@deeprootsystems.com> <1262802737-6601-27-git-send-email-khilman@deeprootsystems.com> X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:80.89151/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 X-pstn-addresses: from <khilman@deeprootsystems.com> [db-null] Cc: davinci-linux-open-source@linux.davincidsp.com X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: <davinci-linux-open-source.linux.davincidsp.com> List-Unsubscribe: <http://linux.davincidsp.com/mailman/options/davinci-linux-open-source>, <mailto:davinci-linux-open-source-request@linux.davincidsp.com?subject=unsubscribe> List-Archive: <http://linux.davincidsp.com/pipermail/davinci-linux-open-source> List-Post: <mailto:davinci-linux-open-source@linux.davincidsp.com> List-Help: <mailto:davinci-linux-open-source-request@linux.davincidsp.com?subject=help> List-Subscribe: <http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source>, <mailto:davinci-linux-open-source-request@linux.davincidsp.com?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com |
diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c index 648fbb7..5a71f4d 100644 --- a/arch/arm/mach-davinci/dma.c +++ b/arch/arm/mach-davinci/dma.c @@ -642,7 +642,7 @@ int edma_alloc_channel(int channel, map_dmach_queue(ctlr, channel, eventq_no); - return channel; + return EDMA_CTLR_CHAN(ctlr, channel); } EXPORT_SYMBOL(edma_alloc_channel);