---

yaml --- r: 355108 b: refs/heads/master c: e78f960 h: refs/heads/master v: v3
git-mirror · Feb 1, 2013 · ae175d5 · ae175d5
1 parent d214b54
commit ae175d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;