From 93205ec88e31bd18fccfea81352a474f0d715561 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Mon, 21 Jan 2013 11:08:58 +0100
Subject: [PATCH] --- yaml --- r: 353708 b: refs/heads/master c:
 93316e263a321de6ef268a2a66c322626bd65cf1 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ata/pata_ep93xx.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e66063239511..ad80ca25a374 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 903b33e0292465ebe9705a70084bf9ad06a8a2a5
+refs/heads/master: 93316e263a321de6ef268a2a66c322626bd65cf1
diff --git a/trunk/drivers/ata/pata_ep93xx.c b/trunk/drivers/ata/pata_ep93xx.c
index 556222f04731..c1bfaf43d109 100644
--- a/trunk/drivers/ata/pata_ep93xx.c
+++ b/trunk/drivers/ata/pata_ep93xx.c
@@ -31,6 +31,7 @@
  *   Copyright (C) 2006 Tower Technologies
  */
 
+#include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -937,9 +938,9 @@ static int ep93xx_pata_probe(struct platform_device *pdev)
 		goto err_rel_gpio;
 	}
 
-	ide_base = devm_request_and_ioremap(&pdev->dev, mem_res);
-	if (!ide_base) {
-		err = -ENXIO;
+	ide_base = devm_ioremap_resource(&pdev->dev, mem_res);
+	if (IS_ERR(ide_base)) {
+		err = PTR_ERR(ide_base);
 		goto err_rel_gpio;
 	}