From 85a3eb0ff7aed8d5049de15261eac35de3bc710f Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 8 Apr 2013 13:04:00 +0300
Subject: [PATCH] --- yaml --- r: 362944 b: refs/heads/master c:
 8e524c95040aa521283aba126c047381eadaed39 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index aab3b579eb77..e0e93e210dd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ab0a48420c95dc4099d1777a5a24dffad102cf1
+refs/heads/master: 8e524c95040aa521283aba126c047381eadaed39
diff --git a/trunk/drivers/video/wm8505fb.c b/trunk/drivers/video/wm8505fb.c
index 19e2e7ff492a..01f9ace068e2 100644
--- a/trunk/drivers/video/wm8505fb.c
+++ b/trunk/drivers/video/wm8505fb.c
@@ -18,6 +18,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/fb.h>
 #include <linux/errno.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
@@ -303,9 +304,9 @@ static int wm8505fb_probe(struct platform_device *pdev)
 	fbi->fb.pseudo_palette	= addr;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	fbi->regbase = devm_request_and_ioremap(&pdev->dev, res);
-	if (fbi->regbase == NULL)
-		return -EBUSY;
+	fbi->regbase = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(fbi->regbase))
+		return PTR_ERR(fbi->regbase);
 
 	disp_timing = of_get_display_timings(pdev->dev.of_node);
 	if (!disp_timing)