From b218d3833dfd995e11ec566bf3ced6205afbd095 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 4 Mar 2013 05:15:21 -0300
Subject: [PATCH] --- yaml --- r: 366655 b: refs/heads/master c:
 2e2d612d80c1cb829769d413a8e8bf64f64197f8 h: refs/heads/master i:   366653:
 49846e7c8053dc1e13e1224913f6589551996616   366651:
 dc78068a7a57f5f824d22fe4367b364eb581f866   366647:
 19748a7060d1d721442b713b24ee47eebbff23df   366639:
 2c2347a0fa69f4379b464c67f1a659385ea75518   366623:
 d62349f9c0840788a4842537a0a0a4643c4ce825   366591:
 93d68ee0c06c8246a6206caacffde8e4f1d19ca9 v: v3

---
 [refs]                                                   | 2 +-
 trunk/drivers/media/platform/soc_camera/sh_mobile_csi2.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ac894f34be16..12dae48e975e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15a0934201780f7a95d9fa3b910e19bf89ab25d5
+refs/heads/master: 2e2d612d80c1cb829769d413a8e8bf64f64197f8
diff --git a/trunk/drivers/media/platform/soc_camera/sh_mobile_csi2.c b/trunk/drivers/media/platform/soc_camera/sh_mobile_csi2.c
index 42c559eb4937..09cb4fc88f34 100644
--- a/trunk/drivers/media/platform/soc_camera/sh_mobile_csi2.c
+++ b/trunk/drivers/media/platform/soc_camera/sh_mobile_csi2.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/err.h>
 #include <linux/i2c.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
@@ -324,11 +325,9 @@ static int sh_csi2_probe(struct platform_device *pdev)
 
 	priv->irq = irq;
 
-	priv->base = devm_request_and_ioremap(&pdev->dev, res);
-	if (!priv->base) {
-		dev_err(&pdev->dev, "Unable to ioremap CSI2 registers.\n");
-		return -ENXIO;
-	}
+	priv->base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(priv->base))
+		return PTR_ERR(priv->base);
 
 	priv->pdev = pdev;
 	platform_set_drvdata(pdev, priv);