From 08ba8647ee0b50f2a4d6da86979a4e49e401a104 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 4 Mar 2013 09:59:00 +0530
Subject: [PATCH] --- yaml --- r: 364206 b: refs/heads/master c:
 84e819220468e989a0dde33bf1121888c5e749b1 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/tty/serial/serial-tegra.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 23218b5f9a59..0064010a71e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19ffd68f816878aed456d5e87697f43bd9e3bd2b
+refs/heads/master: 84e819220468e989a0dde33bf1121888c5e749b1
diff --git a/trunk/drivers/tty/serial/serial-tegra.c b/trunk/drivers/tty/serial/serial-tegra.c
index 372de8ade76a..9799d043a9bd 100644
--- a/trunk/drivers/tty/serial/serial-tegra.c
+++ b/trunk/drivers/tty/serial/serial-tegra.c
@@ -26,6 +26,7 @@
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
+#include <linux/err.h>
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/module.h>
@@ -1301,11 +1302,9 @@ static int tegra_uart_probe(struct platform_device *pdev)
 	}
 
 	u->mapbase = resource->start;
-	u->membase = devm_request_and_ioremap(&pdev->dev, resource);
-	if (!u->membase) {
-		dev_err(&pdev->dev, "memregion/iomap address req failed\n");
-		return -EADDRNOTAVAIL;
-	}
+	u->membase = devm_ioremap_resource(&pdev->dev, resource);
+	if (IS_ERR(u->membase))
+		return PTR_ERR(u->membase);
 
 	tup->uart_clk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(tup->uart_clk)) {