public inbox for linux-arm-kernel@lists.infradead.org 
 help / color / mirror / Atom feed
From: gang.chen@asianux•com (Chen Gang)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] ARM: OMAP: Fix the use of uninitialized dma_lch_count
Date: Fri, 11 Jan 2013 13:39:18 +0800	[thread overview]
Message-ID: <50EFA586.5010508@asianux.com> (raw)
In-Reply-To: <50EE9C87.6060407@ti.com>


  'omap_dma_reserve_channels' when used is suppose to be from command.
    so, it alreay has value before 1st call of omap_system_dma_probe.
    and it will never be changed again during running (not from ioctl).

  but 'dma_lch_count' is zero before 1st call of omap_system_dma_probe.
    so it will be failed for omap_dma_reserve_channels, when 1st call.

  so, need use 'd->lch_count' instead of 'dma_lch_count' for judging.

Signed-off-by: Chen Gang <gang.chen@asianux•com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti•com>
---
 arch/arm/plat-omap/dma.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 4136b20..e06c34b 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -2019,7 +2019,7 @@ static int 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_count))
 		d->lch_count	= omap_dma_reserve_channels;
 
 	dma_lch_count		= d->lch_count;
-- 
1.7.10.4

  parent reply	other threads:[~2013-01-11  5:39 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-10 10:29 [PATCH] arch/arm/plat-omap: initializing dma_lch_count, before judging omap_dma_reserve_channels Chen Gang
2013-01-10 10:48 ` Santosh Shilimkar
2013-01-10 10:51   ` Santosh Shilimkar
2013-01-11  5:09     ` Chen Gang
2013-01-11  5:03   ` Chen Gang
2013-01-11  7:26     ` Santosh Shilimkar
2013-01-11 11:24       ` Chen Gang
2013-01-11  5:39   ` Chen Gang [this message]
2013-01-11 11:38     ` [PATCH] ARM: OMAP: Fix the use of uninitialized dma_lch_count Santosh Shilimkar
2013-02-01 22:40       ` Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=50EFA586.5010508@asianux.com \
    --to=gang.chen@asianux$(echo .)com \
    --cc=linux-arm-kernel@lists$(echo .)infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox