From 533003911db9caa2f18b7ec235e1062ab1bc832a Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Tue, 31 Jan 2012 12:49:00 +0200 Subject: [PATCH] --- yaml --- r: 297494 b: refs/heads/master c: 91c1c9e36d9450974c9f04cf961d0b45aafca507 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/intel_mid_dma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4cbd75854302..fd0b82b196bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f99a4216d68f6d75d5d544aa265d72f193bad7f +refs/heads/master: 91c1c9e36d9450974c9f04cf961d0b45aafca507 diff --git a/trunk/drivers/dma/intel_mid_dma.c b/trunk/drivers/dma/intel_mid_dma.c index 512e2ab3febb..923476d74a5d 100644 --- a/trunk/drivers/dma/intel_mid_dma.c +++ b/trunk/drivers/dma/intel_mid_dma.c @@ -832,7 +832,6 @@ static void intel_mid_dma_free_chan_resources(struct dma_chan *chan) /*trying to free ch in use!!!!!*/ pr_err("ERR_MDMA: trying to free ch in use\n"); } - pm_runtime_put(&mid->pdev->dev); spin_lock_bh(&midc->lock); midc->descs_allocated = 0; list_for_each_entry_safe(desc, _desc, &midc->active_list, desc_node) { @@ -853,6 +852,7 @@ static void intel_mid_dma_free_chan_resources(struct dma_chan *chan) /* Disable CH interrupts */ iowrite32(MASK_INTR_REG(midc->ch_id), mid->dma_base + MASK_BLOCK); iowrite32(MASK_INTR_REG(midc->ch_id), mid->dma_base + MASK_ERR); + pm_runtime_put(&mid->pdev->dev); } /**