From ae175d527d5468a82edcc8ba5d86a3a002283c67 Mon Sep 17 00:00:00 2001 From: Chen Gang Date: Fri, 11 Jan 2013 13:39:18 +0800 Subject: [PATCH] --- yaml --- r: 355108 b: refs/heads/master c: e78f96060fff8545d21360cfa5590e266a595bb9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/dma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5a2399074a94..ff5560390c4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aecb9e1422e904d1950620d90c589a141cb32196 +refs/heads/master: e78f96060fff8545d21360cfa5590e266a595bb9 diff --git a/trunk/arch/arm/plat-omap/dma.c b/trunk/arch/arm/plat-omap/dma.c index 4136b20cba3c..e06c34bdc34a 100644 --- a/trunk/arch/arm/plat-omap/dma.c +++ b/trunk/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;