From 8ea509eaa388e0e428ffcb22bbc8cbbe48913309 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Sat, 30 Mar 2013 02:46:27 +0200
Subject: [PATCH] --- yaml --- r: 364490 b: refs/heads/master c:
 19290816c5fa3f289465d24bfbac9d669cc2f061 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/chipidea/core.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 48123ecca74c..0eca7f3a948b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb36668d5fe784600621d8fdce80f7c280f37a8a
+refs/heads/master: 19290816c5fa3f289465d24bfbac9d669cc2f061
diff --git a/trunk/drivers/usb/chipidea/core.c b/trunk/drivers/usb/chipidea/core.c
index 77963b62c496..42f224936a8e 100644
--- a/trunk/drivers/usb/chipidea/core.c
+++ b/trunk/drivers/usb/chipidea/core.c
@@ -407,11 +407,9 @@ static int ci_hdrc_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	base = devm_request_and_ioremap(dev, res);
-	if (!base) {
-		dev_err(dev, "can't request and ioremap resource\n");
-		return -ENOMEM;
-	}
+	base = devm_ioremap_resource(dev, res);
+	if (IS_ERR(base))
+		return PTR_ERR(base);
 
 	ci = devm_kzalloc(dev, sizeof(*ci), GFP_KERNEL);
 	if (!ci) {