From 2aa4cb653dd005f0e6a574ba96e65b747876a928 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Wed, 1 Feb 2012 16:12:21 +0530 Subject: [PATCH] --- yaml --- r: 297499 b: refs/heads/master c: e8d9f875c9b02bb56ba3bb44834ae81ba0e8efbc h: refs/heads/master i: 297497: eb101c0711c4be4821f37e963d5be2cc821ca523 297495: def052aae05c763d5a40335fb3f058022cbb1195 v: v3 --- [refs] | 2 +- trunk/drivers/dma/dw_dmac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4edaacf0a8bb..d15b99df5b61 100644 --- 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 index 3a3d7edcd553..157739423734 100644 --- 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;