From 164d3b0df0fa1836f5c12c6c27915686035b2d58 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@nokia.com>
Date: Tue, 26 Apr 2011 02:25:16 -0700
Subject: [PATCH] --- yaml --- r: 251839 b: refs/heads/master c:
 da9e7392f4b0c295a47ec7def38629959eb51ff2 h: refs/heads/master i:   251837:
 c69a4ba631062d511191c11e007bb87643e8df1d   251835:
 1e1bd4371dfe0c16c777b1d6aecba7b0312e0501   251831:
 2f8e2771a12bdb530a8ff945973802d9a96471d8   251823:
 5d72b7e19b19d5f411fadc284acbb7e8b9c9830c   251807:
 036ffe8359ec6fcfb1a65295c9ab665e2afb3054   251775:
 bec92d8a63c270b1423d831ad1a3b41fa9086795 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-omap2/smartreflex.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 933f2678f3dc..d759649d36a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bf6e2eca2a32fc6ea69eb499313234476a526d7
+refs/heads/master: da9e7392f4b0c295a47ec7def38629959eb51ff2
diff --git a/trunk/arch/arm/mach-omap2/smartreflex.c b/trunk/arch/arm/mach-omap2/smartreflex.c
index dbc4b6f12294..703143a8700b 100644
--- a/trunk/arch/arm/mach-omap2/smartreflex.c
+++ b/trunk/arch/arm/mach-omap2/smartreflex.c
@@ -847,6 +847,14 @@ static int __init omap_sr_probe(struct platform_device *pdev)
 		goto err_free_devinfo;
 	}
 
+	mem = request_mem_region(mem->start, resource_size(mem),
+					dev_name(&pdev->dev));
+	if (!mem) {
+		dev_err(&pdev->dev, "%s: no mem region\n", __func__);
+		ret = -EBUSY;
+		goto err_free_devinfo;
+	}
+
 	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 
 	pm_runtime_enable(&pdev->dev);