From 64568a4ac2600b6958da85cad765a713dc49ac52 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Mon, 21 Jan 2013 11:09:06 +0100
Subject: [PATCH] --- yaml --- r: 353711 b: refs/heads/master c:
 bc5e6dea81b025aba8fecec5c18f6faf81db9562 h: refs/heads/master i:   353709:
 ea2aa107c5462d708d5acfac9648c0b35b1c3dd9   353707:
 f507de173c4b5a0e29b3c9c4d929f9051d2fc106   353703:
 1df66502e828cd6cff222033f6724fa1a7e014e6   353695:
 e9d857b2a1808f007e8efb3730ed05125dde99b2 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/iommu/tegra-smmu.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6a7765801f82..a00116027add 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4ed60259e16106566ca489f64ebbd8a379d8972
+refs/heads/master: bc5e6dea81b025aba8fecec5c18f6faf81db9562
diff --git a/trunk/drivers/iommu/tegra-smmu.c b/trunk/drivers/iommu/tegra-smmu.c
index fc178893789a..f08dbcd2f175 100644
--- a/trunk/drivers/iommu/tegra-smmu.c
+++ b/trunk/drivers/iommu/tegra-smmu.c
@@ -19,6 +19,7 @@
 
 #define pr_fmt(fmt)	"%s(): " fmt, __func__
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
@@ -1176,9 +1177,9 @@ static int tegra_smmu_probe(struct platform_device *pdev)
 		res = platform_get_resource(pdev, IORESOURCE_MEM, i);
 		if (!res)
 			return -ENODEV;
-		smmu->regs[i] = devm_request_and_ioremap(&pdev->dev, res);
-		if (!smmu->regs[i])
-			return -EBUSY;
+		smmu->regs[i] = devm_ioremap_resource(&pdev->dev, res);
+		if (IS_ERR(smmu->regs[i]))
+			return PTR_ERR(smmu->regs[i]);
 	}
 
 	err = of_get_dma_window(dev->of_node, NULL, 0, NULL, &base, &size);