From 6465b4916bdced5a16335d4325a64b075718e6d8 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <Aaro.Koskinen@nokia.com>
Date: Fri, 28 Jan 2011 14:50:55 +0000
Subject: [PATCH] --- yaml --- r: 232959 b: refs/heads/master c:
 9d47e309015b8d5ab32851cd0216e4b96b6407e4 h: refs/heads/master i:   232957:
 effa9af9e90326b4a7cf9160f7e6f3d2a6018765   232955:
 a940d10ffbd2bca267f92935460fd1b90c544765   232951:
 0370ecb0617019a3c50067948dff277ca6eb3e9c   232943:
 1ce3057cc62d261bfc593bd2b93e785e8e2274ba   232927:
 4f917755e2b2a18f9ec2a70edb186fc62e9c0d39   232895:
 5648e13eab641ae2738714f2497e1fc1e2587a6d   232831:
 bfcff1b931088498b2064ae29e441e15d085f098   232703:
 6dae69561a64eb10ba3010f19cdff725e9f7a95e   232447:
 c9e3efae039dad850c8117e4999ba1bb8fc467e6 v: v3

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

diff --git a/[refs] b/[refs]
index 025b8820dd1f..ae365ba4b25b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 713f25cec6331fca414aefb2ab5b20d88c610a2f
+refs/heads/master: 9d47e309015b8d5ab32851cd0216e4b96b6407e4
diff --git a/trunk/arch/arm/mach-omap2/mux.c b/trunk/arch/arm/mach-omap2/mux.c
index fae49d12bc76..98148b6c36e9 100644
--- a/trunk/arch/arm/mach-omap2/mux.c
+++ b/trunk/arch/arm/mach-omap2/mux.c
@@ -1000,6 +1000,7 @@ int __init omap_mux_init(const char *name, u32 flags,
 	if (!partition->base) {
 		pr_err("%s: Could not ioremap mux partition at 0x%08x\n",
 			__func__, partition->phys);
+		kfree(partition);
 		return -ENODEV;
 	}