From ae081a95820342267f7f78bbba6c6bfb2fd07271 Mon Sep 17 00:00:00 2001
From: Adrian Hunter <adrian.hunter@intel.com>
Date: Fri, 16 Dec 2011 11:01:39 +0200
Subject: [PATCH] --- yaml --- r: 286140 b: refs/heads/master c:
 2a0ff7a602714990b10a8749e908dad48401138e h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/dma/intel_mid_dma.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 95e7b4a7d987..ad89b1f15294 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fded07513ea57b5ee128958ff119e05588b7227
+refs/heads/master: 2a0ff7a602714990b10a8749e908dad48401138e
diff --git a/trunk/drivers/dma/intel_mid_dma.c b/trunk/drivers/dma/intel_mid_dma.c
index d4b961677e02..bbcd470c3236 100644
--- a/trunk/drivers/dma/intel_mid_dma.c
+++ b/trunk/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);