From 6e26bfc9b8fa29d4e44356096bb3f96872850583 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Mon, 21 Jan 2013 11:09:09 +0100
Subject: [PATCH] --- yaml --- r: 353713 b: refs/heads/master c:
 6c2db1c682a9668b854f9f4025650f7145bd090f h: refs/heads/master i:   353711:
 64568a4ac2600b6958da85cad765a713dc49ac52 v: v3

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

diff --git a/[refs] b/[refs]
index 78f17b36f369..aced47997971 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d65e8e4a1cae5f92f21d4efd6999d6fcbc9ddc0e
+refs/heads/master: 6c2db1c682a9668b854f9f4025650f7145bd090f
diff --git a/trunk/drivers/mfd/intel_msic.c b/trunk/drivers/mfd/intel_msic.c
index ab8d0b2739b2..1804331bd52c 100644
--- a/trunk/drivers/mfd/intel_msic.c
+++ b/trunk/drivers/mfd/intel_msic.c
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/err.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/module.h>
@@ -424,11 +425,9 @@ static int intel_msic_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	msic->irq_base = devm_request_and_ioremap(&pdev->dev, res);
-	if (!msic->irq_base) {
-		dev_err(&pdev->dev, "failed to map SRAM memory\n");
-		return -ENOMEM;
-	}
+	msic->irq_base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(msic->irq_base))
+		return PTR_ERR(msic->irq_base);
 
 	platform_set_drvdata(pdev, msic);