summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2011-12-16 10:01:39 +0100
committerVinod Koul <vinod.koul@linux.intel.com>2011-12-23 17:20:57 +0100
commit2a0ff7a602714990b10a8749e908dad48401138e (patch)
treedf445b369f9404496e763fa3507110cfcb47371a /drivers/dma
parentdmaengine: intel_mid_dma: locking and freeing fixes (diff)
downloadlinux-2a0ff7a602714990b10a8749e908dad48401138e.tar.xz
linux-2a0ff7a602714990b10a8749e908dad48401138e.zip
dmaengine: intel_mid_dma: error path fix
Add missing iounmap in error path. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/intel_mid_dma.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index d4b961677e02..bbcd470c3236 100644
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
@@ -1104,7 +1104,8 @@ static int mid_setup_dma(struct pci_dev *pdev)
LNW_PERIPHRAL_MASK_SIZE);
if (dma->mask_reg == NULL) {
pr_err("ERR_MDMA:Can't map periphral intr space !!\n");
- return -ENOMEM;
+ err = -ENOMEM;
+ goto err_ioremap;
}
} else
dma->mask_reg = NULL;
@@ -1201,6 +1202,9 @@ static int mid_setup_dma(struct pci_dev *pdev)
err_engine:
free_irq(pdev->irq, dma);
err_irq:
+ if (dma->mask_reg)
+ iounmap(dma->mask_reg);
+err_ioremap:
pci_pool_destroy(dma->dma_pool);
err_dma_pool:
pr_err("ERR_MDMA:setup_dma failed: %d\n", err);