From ec4398398c6d04bb8a6a75ae804a22de07d069c3 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Mon, 21 Jan 2013 11:09:21 +0100
Subject: [PATCH] --- yaml --- r: 353678 b: refs/heads/master c:
 eb612fa013ca07b954300fa46b1499248cedf926 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2f2066110077..a288fdfc0b4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97f4be60178fec663baaa30a09ae102fd33373c2
+refs/heads/master: eb612fa013ca07b954300fa46b1499248cedf926
diff --git a/trunk/drivers/tty/serial/sccnxp.c b/trunk/drivers/tty/serial/sccnxp.c
index 418b495e3233..e869eab180be 100644
--- a/trunk/drivers/tty/serial/sccnxp.c
+++ b/trunk/drivers/tty/serial/sccnxp.c
@@ -15,6 +15,7 @@
 #define SUPPORT_SYSRQ
 #endif
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/console.h>
@@ -875,10 +876,9 @@ static int sccnxp_probe(struct platform_device *pdev)
 		goto err_out;
 	}
 
-	membase = devm_request_and_ioremap(&pdev->dev, res);
-	if (!membase) {
-		dev_err(&pdev->dev, "Failed to ioremap\n");
-		ret = -EIO;
+	membase = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(membase)) {
+		ret = PTR_ERR(membase);
 		goto err_out;
 	}