From 3d49f2d74278325ec23881981fa8f011850d0a5a Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 4 Mar 2013 06:45:32 +0000
Subject: [PATCH] --- yaml --- r: 361575 b: refs/heads/master c:
 6bc51b662241738ac292ffa021b345c2aa604230 h: refs/heads/master i:   361573:
 3f18c2488b3d6b14fab9662b590dc6453c0fe0af   361571:
 8606b19d3212fb4a9e76cdaf9acf681243444089   361567:
 d309508331f5fc824eaff2bb176615b164b786e8 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/thermal/dove_thermal.c | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 5ba219e9f6df..f1c3ef79c750 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0e68fc3caf677e834f7bd0f601800e686b56c98
+refs/heads/master: 6bc51b662241738ac292ffa021b345c2aa604230
diff --git a/trunk/drivers/thermal/dove_thermal.c b/trunk/drivers/thermal/dove_thermal.c
index 7b0bfa0e7a9c..3078c403b42d 100644
--- a/trunk/drivers/thermal/dove_thermal.c
+++ b/trunk/drivers/thermal/dove_thermal.c
@@ -143,22 +143,18 @@ static int dove_thermal_probe(struct platform_device *pdev)
 	if (!priv)
 		return -ENOMEM;
 
-	priv->sensor = devm_request_and_ioremap(&pdev->dev, res);
-	if (!priv->sensor) {
-		dev_err(&pdev->dev, "Failed to request_ioremap memory\n");
-		return -EADDRNOTAVAIL;
-	}
+	priv->sensor = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(priv->sensor))
+		return PTR_ERR(priv->sensor);
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
 	if (!res) {
 		dev_err(&pdev->dev, "Failed to get platform resource\n");
 		return -ENODEV;
 	}
-	priv->control = devm_request_and_ioremap(&pdev->dev, res);
-	if (!priv->control) {
-		dev_err(&pdev->dev, "Failed to request_ioremap memory\n");
-		return -EADDRNOTAVAIL;
-	}
+	priv->control = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(priv->control))
+		return PTR_ERR(priv->control);
 
 	ret = dove_init_sensor(priv);
 	if (ret) {