| Message ID | 1356813800-4705-1-git-send-email-ahemaily@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
$subject s/arm:omap/ARM: OMAP: On Sunday 30 December 2012 02:13 AM, ahemaily@gmail.com wrote: > From: ahemaily <ahemaily@gmail.com> > > 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. s/it/it is > I change the place of dma_lch_count initialization to be before the comparison. > s/I change the place of dma_lch_count initialization to be before the comparison./ Initialize dma_lch_count before it is being used for comparison. > Signed-off-by: Abdelrahman Hemaily <ahemaily@gmail.com> > --- Change looks good to my eyes o.w Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> -- 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
Hi, On Sunday 30 December 2012 02:13 AM, ahemaily@gmail.com wrote: > From: ahemaily <ahemaily@gmail.com> > > 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 <ahemaily@gmail.com> > --- > 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 Regards, Sricharan -- 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 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; dma_chan_count = dma_lch_count; dma_chan = d->chan; enable_1510_mode = d->dev_caps & ENABLE_1510_MODE;