From 23732c8f2b366ddae32537350cf61883ff6a6642 Mon Sep 17 00:00:00 2001
From: Shubhrajyoti D <shubhrajyoti@ti.com>
Date: Mon, 24 Oct 2011 15:54:24 +0530
Subject: [PATCH] --- yaml --- r: 271177 b: refs/heads/master c:
 1458d160de3f1862aeaac57447ba96e7857ac52b h: refs/heads/master i:   271175:
 b6417c5445afc0023db14e4f7d64ad41cf58d620 v: v3

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

diff --git a/[refs] b/[refs]
index 04835f5d1805..4fc883e05945 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a853ba8d6d5d76bcbc5bf35b945b5727b5e5a36d
+refs/heads/master: 1458d160de3f1862aeaac57447ba96e7857ac52b
diff --git a/trunk/drivers/spi/spi-omap2-mcspi.c b/trunk/drivers/spi/spi-omap2-mcspi.c
index fde3a2d4f120..322be7aea8b4 100644
--- a/trunk/drivers/spi/spi-omap2-mcspi.c
+++ b/trunk/drivers/spi/spi-omap2-mcspi.c
@@ -1116,15 +1116,16 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)
 		status = -ENODEV;
 		goto err1;
 	}
+
+	r->start += pdata->regs_offset;
+	r->end += pdata->regs_offset;
+	mcspi->phys = r->start;
 	if (!request_mem_region(r->start, resource_size(r),
 				dev_name(&pdev->dev))) {
 		status = -EBUSY;
 		goto err1;
 	}
 
-	r->start += pdata->regs_offset;
-	r->end += pdata->regs_offset;
-	mcspi->phys = r->start;
 	mcspi->base = ioremap(r->start, resource_size(r));
 	if (!mcspi->base) {
 		dev_dbg(&pdev->dev, "can't ioremap MCSPI\n");