From 12dedfe3910ec1092d9f2fd040bd2c30ae3d4e55 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Mon, 21 Jan 2013 11:09:10 +0100
Subject: [PATCH] --- yaml --- r: 353673 b: refs/heads/master c:
 1684789f86cbd6a1aff82970992c711898b19995 h: refs/heads/master i:   353671:
 2ff6e91b1e09d61bc2cefe391bc6207bfbf5d2e6 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/misc/atmel-ssc.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 284cb6fed05c..44393ffb8b48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06303c2e00701724acb95069ca46f87c998c4be1
+refs/heads/master: 1684789f86cbd6a1aff82970992c711898b19995
diff --git a/trunk/drivers/misc/atmel-ssc.c b/trunk/drivers/misc/atmel-ssc.c
index 3c09cbb70b1d..c208238b890a 100644
--- a/trunk/drivers/misc/atmel-ssc.c
+++ b/trunk/drivers/misc/atmel-ssc.c
@@ -159,11 +159,9 @@ static int ssc_probe(struct platform_device *pdev)
 		return -ENXIO;
 	}
 
-	ssc->regs = devm_request_and_ioremap(&pdev->dev, regs);
-	if (!ssc->regs) {
-		dev_dbg(&pdev->dev, "ioremap failed\n");
-		return -EINVAL;
-	}
+	ssc->regs = devm_ioremap_resource(&pdev->dev, regs);
+	if (IS_ERR(ssc->regs))
+		return PTR_ERR(ssc->regs);
 
 	ssc->phybase = regs->start;