From 9061a8e833d69ebb31150c867b29785d9fa817c2 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 8 Apr 2013 15:49:33 +0530
Subject: [PATCH] --- yaml --- r: 365247 b: refs/heads/master c:
 cbfd6a21b6fae968d10374bc5913823573b517ef h: refs/heads/master i:   365245:
 7a972f2b684ad351813c41fbe0cc23f2eb18531f   365243:
 57ad58368de940b3bfcd0d51894c8179355a5f0f   365239:
 2cd2bbfcf0d3f3a574ab463896f0ff8eec75df61   365231:
 10d9e9ff7156d0d0d92586f1dc32f6804f92ceef   365215:
 5c46b22235c081c65096f638878812ae0fe94ff8   365183:
 854ae2fb743bd98d9fed84dccfda3d149340d1e9 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/spi/spi-pxa2xx.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d2e97195bc65..6ec40e9089ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f333a331adfacf8c7a9dbf7e5f72b10a0356156b
+refs/heads/master: cbfd6a21b6fae968d10374bc5913823573b517ef
diff --git a/trunk/drivers/spi/spi-pxa2xx.c b/trunk/drivers/spi/spi-pxa2xx.c
index c6d5b97c7240..75a844623b4a 100644
--- a/trunk/drivers/spi/spi-pxa2xx.c
+++ b/trunk/drivers/spi/spi-pxa2xx.c
@@ -22,6 +22,7 @@
 #include <linux/device.h>
 #include <linux/ioport.h>
 #include <linux/errno.h>
+#include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/spi/pxa2xx_spi.h>
@@ -1088,11 +1089,9 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev)
 	ssp = &pdata->ssp;
 
 	ssp->phys_base = res->start;
-	ssp->mmio_base = devm_request_and_ioremap(&pdev->dev, res);
-	if (!ssp->mmio_base) {
-		dev_err(&pdev->dev, "failed to ioremap mmio_base\n");
-		return NULL;
-	}
+	ssp->mmio_base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(ssp->mmio_base))
+		return PTR_ERR(ssp->mmio_base);
 
 	ssp->clk = devm_clk_get(&pdev->dev, NULL);
 	ssp->irq = platform_get_irq(pdev, 0);