From 5a442047af9536460badcbd9d087a6b269bb7a43 Mon Sep 17 00:00:00 2001
From: Shubhrajyoti D <shubhrajyoti@ti.com>
Date: Thu, 2 Aug 2012 16:41:25 +0530
Subject: [PATCH] --- yaml --- r: 321859 b: refs/heads/master c:
 37a2d84a38df16e614bbfbb18a5155ebd8256938 h: refs/heads/master i:   321857:
 10fc7681098d8951daa1f1ad106a312188696ebb   321855:
 f16b8c1deb1c63c5241df0698213cc1dc6115e47 v: v3

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

diff --git a/[refs] b/[refs]
index 17d618b9ad7a..a03da1239513 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10ce0473e0de3ff8c091735f85c20fceace061cd
+refs/heads/master: 37a2d84a38df16e614bbfbb18a5155ebd8256938
diff --git a/trunk/drivers/spi/spi-omap2-mcspi.c b/trunk/drivers/spi/spi-omap2-mcspi.c
index bc4778175e34..b2fb141da375 100644
--- a/trunk/drivers/spi/spi-omap2-mcspi.c
+++ b/trunk/drivers/spi/spi-omap2-mcspi.c
@@ -1228,18 +1228,16 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev)
 
 	status = spi_register_master(master);
 	if (status < 0)
-		goto err_spi_register;
+		goto disable_pm;
 
 	return status;
 
-err_spi_register:
-	spi_master_put(master);
 disable_pm:
 	pm_runtime_disable(&pdev->dev);
 dma_chnl_free:
 	kfree(mcspi->dma_channels);
 free_master:
-	kfree(master);
+	spi_master_put(master);
 	platform_set_drvdata(pdev, NULL);
 	return status;
 }