From 3ce8eb62ef4aee97dff025ba88733861483a803b Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Wed, 6 Oct 2010 08:20:35 +0000 Subject: [PATCH] --- yaml --- r: 218786 b: refs/heads/master c: f57b407cfd5fbd70251e9fa0ea7aa083ac06d25c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/ste_dma40.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 29946d7c9c2f..0165fd6af916 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c0f24019f69c5199996ed9c76d05c92c6186ba8 +refs/heads/master: f57b407cfd5fbd70251e9fa0ea7aa083ac06d25c diff --git a/trunk/drivers/dma/ste_dma40.c b/trunk/drivers/dma/ste_dma40.c index 05d0a9937617..2f73e366111e 100644 --- a/trunk/drivers/dma/ste_dma40.c +++ b/trunk/drivers/dma/ste_dma40.c @@ -2449,9 +2449,11 @@ static int __init d40_phy_res_init(struct d40_base *base) /* Mark disabled channels as occupied */ for (i = 0; base->plat_data->disabled_channels[i] != -1; i++) { - base->phy_res[i].allocated_src = D40_ALLOC_PHY; - base->phy_res[i].allocated_dst = D40_ALLOC_PHY; - num_phy_chans_avail--; + int chan = base->plat_data->disabled_channels[i]; + + base->phy_res[chan].allocated_src = D40_ALLOC_PHY; + base->phy_res[chan].allocated_dst = D40_ALLOC_PHY; + num_phy_chans_avail--; } dev_info(base->dev, "%d of %d physical DMA channels available\n",