From 212a1c473209a95ed4518611b35cb85fe5cbd037 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Mon, 21 Jan 2013 11:09:15 +0100
Subject: [PATCH] --- yaml --- r: 353716 b: refs/heads/master c:
 e2cbdf3cb72571f1231cd7c3cb14009f9b8df707 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6045e04309c8..3336e9e7214d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0de774c6334dccdcd43a7ef46155a1f3a52a954
+refs/heads/master: e2cbdf3cb72571f1231cd7c3cb14009f9b8df707
diff --git a/trunk/drivers/power/jz4740-battery.c b/trunk/drivers/power/jz4740-battery.c
index bf914893c6fd..c675553d4647 100644
--- a/trunk/drivers/power/jz4740-battery.c
+++ b/trunk/drivers/power/jz4740-battery.c
@@ -22,6 +22,7 @@
 #include <linux/io.h>
 
 #include <linux/delay.h>
+#include <linux/err.h>
 #include <linux/gpio.h>
 #include <linux/mfd/core.h>
 #include <linux/power_supply.h>
@@ -266,9 +267,9 @@ static int jz_battery_probe(struct platform_device *pdev)
 
 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-	jz_battery->base = devm_request_and_ioremap(&pdev->dev, mem);
-	if (!jz_battery->base)
-		return -EBUSY;
+	jz_battery->base = devm_ioremap_resource(&pdev->dev, mem);
+	if (IS_ERR(jz_battery->base))
+		return PTR_ERR(jz_battery->base);
 
 	battery = &jz_battery->battery;
 	battery->name = pdata->info.name;