From: gang.chen@asianux•com (Chen Gang)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] arch/arm/plat-omap: initializing dma_lch_count, before judging omap_dma_reserve_channels
Date: Thu, 10 Jan 2013 18:29:41 +0800 [thread overview]
Message-ID: <50EE9815.2080402@asianux.com> (raw)
dma_lch_count is zero before 1st call of omap_system_dma_probe.
omap_dma_reserve_channels has value before 1st call of omap_system_dma_probe
when 1st call of omap_system_dma_probe
we need set dma_lch_count before use it for judging
or which will be failed for omap_dma_reserve_channels
additional info:
this patch is only for fixing bug, not touch the features.
so, not use d->lch_count instead of dma_lch_count for the statement:
&& (omap_dma_reserve_channels <= dma_lch_count))
at least, now, current fixing is equal to above.
in the future
maybe omap_dma_reserve_channels can be set by outside (such as from /proc)
dma_lch_count is a static global variable which has effect to all devices.
maybe the original author do not hope the newer is larger than the older
Signed-off-by: Chen Gang <gang.chen@asianux•com>
---
arch/arm/plat-omap/dma.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 4136b20..b382eef 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -2018,6 +2018,9 @@ static int omap_system_dma_probe(struct platform_device *pdev)
d = p->dma_attr;
errata = p->errata;
+ if (!dma_lch_count)
+ 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;
--
1.7.10.4
next reply other threads:[~2013-01-10 10:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-10 10:29 Chen Gang [this message]
2013-01-10 10:48 ` [PATCH] arch/arm/plat-omap: initializing dma_lch_count, before judging omap_dma_reserve_channels 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 ` [PATCH] ARM: OMAP: Fix the use of uninitialized dma_lch_count Chen Gang
2013-01-11 11:38 ` 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=50EE9815.2080402@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