---

yaml --- r: 297499 b: refs/heads/master c: e8d9f87 h: refs/heads/master i: 297497: eb101c0 297495: def052a v: v3
git-mirror · Feb 22, 2012 · 2aa4cb6 · 2aa4cb6
1 parent 898e0e5
commit 2aa4cb6
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: 8c9f7aa316f547f70d270a08d1212f958721c071
+refs/heads/master: e8d9f875c9b02bb56ba3bb44834ae81ba0e8efbc
diff --git a/trunk/drivers/dma/dw_dmac.c b/trunk/drivers/dma/dw_dmac.c
@@ -1432,7 +1432,7 @@ static int __init dw_probe(struct platform_device *pdev)
 
 		/* 7 is highest priority & 0 is lowest. */
 		if (pdata->chan_priority == CHAN_PRIORITY_ASCENDING)
-			dwc->priority = 7 - i;
+			dwc->priority = pdata->nr_channels - i - 1;
 		else
 			dwc->priority = i;