Commit e78f9606 authored Jan 11, 2013 by Chen Gang Committed by Tony Lindgren Feb 01, 2013

ARM: OMAP: Fix the use of uninitialized dma_lch_count




  '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>
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent aecb9e14

arch/arm/plat-omap/dma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message