From 909aadfc68d4da6511aa98720ff5b0a329534c1c Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 4 Mar 2013 14:24:39 +0530
Subject: [PATCH] --- yaml --- r: 364207 b: refs/heads/master c:
 82b231323e419dcd61de9ff38d66dd7e82564594 h: refs/heads/master i:   364205:
 6ff269dbfd0ed9041b7cdf49b88bd75b3ee07f03   364203:
 4a1ce2e0d995832c1f09fc0a97e34d2855e239c9   364199:
 1b2b42df23cbffd371b2c8f7e31555e4ea930ec4   364191:
 2b8827cf5f1e6615c8debfcd1e55613e73f30cac v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/tty/serial/vt8500_serial.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0064010a71e5..dd2a437ef935 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84e819220468e989a0dde33bf1121888c5e749b1
+refs/heads/master: 82b231323e419dcd61de9ff38d66dd7e82564594
diff --git a/trunk/drivers/tty/serial/vt8500_serial.c b/trunk/drivers/tty/serial/vt8500_serial.c
index a3f9dd5c9dff..f15f53f18ca9 100644
--- a/trunk/drivers/tty/serial/vt8500_serial.c
+++ b/trunk/drivers/tty/serial/vt8500_serial.c
@@ -35,6 +35,7 @@
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
+#include <linux/err.h>
 
 /*
  * UART Register offsets
@@ -585,9 +586,9 @@ static int vt8500_serial_probe(struct platform_device *pdev)
 	if (!vt8500_port)
 		return -ENOMEM;
 
-	vt8500_port->uart.membase = devm_request_and_ioremap(&pdev->dev, mmres);
-	if (!vt8500_port->uart.membase)
-		return -EADDRNOTAVAIL;
+	vt8500_port->uart.membase = devm_ioremap_resource(&pdev->dev, mmres);
+	if (IS_ERR(vt8500_port->uart.membase))
+		return PTR_ERR(vt8500_port->uart.membase);
 
 	vt8500_port->clk = of_clk_get(pdev->dev.of_node, 0);
 	if (IS_ERR(vt8500_port->clk)) {