From f507de173c4b5a0e29b3c9c4d929f9051d2fc106 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Mon, 21 Jan 2013 11:08:57 +0100
Subject: [PATCH] --- yaml --- r: 353707 b: refs/heads/master c:
 903b33e0292465ebe9705a70084bf9ad06a8a2a5 h: refs/heads/master i:   353705:
 15a261cbada256c30edbf215b8282b7fb85dcf0a   353703:
 1df66502e828cd6cff222033f6724fa1a7e014e6 v: v3

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

diff --git a/[refs] b/[refs]
index 511ffe737c25..e66063239511 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c390a7e956b4bf7b7d6dba4dfb93299c4f0879a
+refs/heads/master: 903b33e0292465ebe9705a70084bf9ad06a8a2a5
diff --git a/trunk/drivers/amba/tegra-ahb.c b/trunk/drivers/amba/tegra-ahb.c
index 536c166f4253..ab92785f54dc 100644
--- a/trunk/drivers/amba/tegra-ahb.c
+++ b/trunk/drivers/amba/tegra-ahb.c
@@ -20,6 +20,7 @@
  *
  */
 
+#include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -257,9 +258,9 @@ static int tegra_ahb_probe(struct platform_device *pdev)
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res)
 		return -ENODEV;
-	ahb->regs = devm_request_and_ioremap(&pdev->dev, res);
-	if (!ahb->regs)
-		return -EBUSY;
+	ahb->regs = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(ahb->regs))
+		return PTR_ERR(ahb->regs);
 
 	ahb->dev = &pdev->dev;
 	platform_set_drvdata(pdev, ahb);