From patchwork Thu Jan 3 08:38:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 1926651 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 2DB7E3FC5A for ; Thu, 3 Jan 2013 08:37:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753027Ab3ACIhy (ORCPT ); Thu, 3 Jan 2013 03:37:54 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:53803 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752834Ab3ACIhy (ORCPT ); Thu, 3 Jan 2013 03:37:54 -0500 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r038bfgI014262; Thu, 3 Jan 2013 02:37:41 -0600 Received: from DLEE74.ent.ti.com (dlee74.ent.ti.com [157.170.170.8]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r038beg2030115; Thu, 3 Jan 2013 02:37:41 -0600 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Thu, 3 Jan 2013 02:37:41 -0600 Received: from [172.24.75.130] (h75-130.vpn.ti.com [172.24.75.130]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r038banb010004; Thu, 3 Jan 2013 02:37:37 -0600 Message-ID: <50E5438A.1050902@ti.com> Date: Thu, 3 Jan 2013 14:08:34 +0530 From: Santosh Shilimkar User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: R Sricharan CC: , , , , , Subject: Re: [PATCH 1/1] arm :omap :DMA: fix a bug on reserving the omap SDMA channels References: <1356813800-4705-1-git-send-email-ahemaily@gmail.com> <50E5330B.2060007@ti.com> In-Reply-To: <50E5330B.2060007@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org On Thursday 03 January 2013 12:58 PM, R Sricharan wrote: > Hi, > > On Sunday 30 December 2012 02:13 AM, ahemaily@gmail.com wrote: >> From: ahemaily >> >> The variable dma_lch_count used for comparison >> (omap_dma_reserve_channels <= dma_lch_count) >> before it initialized to the value from omap_dma_dev_attr : d->lch_count. >> >> I change the place of dma_lch_count initialization to be before the >> comparison. >> >> Signed-off-by: Abdelrahman Hemaily >> --- >> arch/arm/plat-omap/dma.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c >> index c76ed8b..cb3e321 100644 >> --- a/arch/arm/plat-omap/dma.c >> +++ b/arch/arm/plat-omap/dma.c >> @@ -2014,12 +2014,12 @@ static int __devinit >> omap_system_dma_probe(struct platform_device *pdev) >> >> d = p->dma_attr; >> errata = p->errata; >> - >> + dma_lch_count = d->lch_count; >> + >> if ((d->dev_caps & RESERVE_CHANNEL) && omap_dma_reserve_channels >> && (omap_dma_reserve_channels <= dma_lch_count)) >> d->lch_count = omap_dma_reserve_channels; >> >> - dma_lch_count = d->lch_count; > By removing this line, you are effectively not assigning > d->lch_count after reserving. So the patch should only change > dma_lch_count in the above "if statement" to d->lch_count > You are right. I missed it in last review. Below should be enough. dma_lch_count = d->lch_count; --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 37a488a..555ff7b 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -2019,7 +2019,7 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev) errata = p->errata; if ((d->dev_caps & RESERVE_CHANNEL) && omap_dma_reserve_channels - && (omap_dma_reserve_channels <= dma_lch_count)) + && (omap_dma_reserve_channels <= d->lch_coun)) d->lch_count = omap_dma_reserve_channels;