From 558d5b47f1a9ef3f8dce805c0d2cc0dd6a9bd9ab Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 23 Dec 2011 18:39:31 +0100
Subject: [PATCH] --- yaml --- r: 287245 b: refs/heads/master c:
 e0feca899c9785316ec67954f1a8e84102eaaca7 h: refs/heads/master i:   287243:
 2858fffb173d1fe03236c6e934564a8d152e2a90 v: v3

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

diff --git a/[refs] b/[refs]
index dc8100749b6d..780d7a3ca58f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d82e5190da9057e31d6f0fe5771dfbe55ff9125f
+refs/heads/master: e0feca899c9785316ec67954f1a8e84102eaaca7
diff --git a/trunk/arch/arm/mach-omap2/devices.c b/trunk/arch/arm/mach-omap2/devices.c
index 0b510ad01a00..283d11eae693 100644
--- a/trunk/arch/arm/mach-omap2/devices.c
+++ b/trunk/arch/arm/mach-omap2/devices.c
@@ -405,6 +405,7 @@ static int omap_mcspi_init(struct omap_hwmod *oh, void *unused)
 			break;
 	default:
 			pr_err("Invalid McSPI Revision value\n");
+			kfree(pdata);
 			return -EINVAL;
 	}