From 482c84c10cf947fd81ab976e7f69e22ebc37a788 Mon Sep 17 00:00:00 2001
From: Abhijith Das <adas@redhat.com>
Date: Fri, 5 Feb 2010 18:25:41 -0500
Subject: [PATCH] --- yaml --- r: 180525 b: refs/heads/master c:
 0e5a9fb0426108d750c97c25b1ab04d3768b5aff h: refs/heads/master i:   180523:
 cebb4a360c6703842358a29f67b6c3e344e42fb8 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-omap2/mmc-twl4030.c | 7 +------
 trunk/fs/gfs2/ops_fstype.c              | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 8a480d7e5815..d64790d7e0c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dfd459b738cf1f65b3eac4e0a9b19bc93cc91c6
+refs/heads/master: 0e5a9fb0426108d750c97c25b1ab04d3768b5aff
diff --git a/trunk/arch/arm/mach-omap2/mmc-twl4030.c b/trunk/arch/arm/mach-omap2/mmc-twl4030.c
index 8afe9dd3f150..0c3c72d934bf 100644
--- a/trunk/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/trunk/arch/arm/mach-omap2/mmc-twl4030.c
@@ -408,7 +408,6 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
 {
 	struct twl4030_hsmmc_info *c;
 	int nr_hsmmc = ARRAY_SIZE(hsmmc_data);
-	int i;
 
 	if (cpu_is_omap2430()) {
 		control_pbias_offset = OMAP243X_CONTROL_PBIAS_LITE;
@@ -435,7 +434,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
 		mmc = kzalloc(sizeof(struct omap_mmc_platform_data), GFP_KERNEL);
 		if (!mmc) {
 			pr_err("Cannot allocate memory for mmc device!\n");
-			goto done;
+			return;
 		}
 
 		if (c->name)
@@ -533,10 +532,6 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
 			continue;
 		c->dev = mmc->dev;
 	}
-
-done:
-	for (i = 0; i < nr_hsmmc; i++)
-		kfree(hsmmc_data[i]);
 }
 
 #endif
diff --git a/trunk/fs/gfs2/ops_fstype.c b/trunk/fs/gfs2/ops_fstype.c
index 8a102f731003..a86ed6381566 100644
--- a/trunk/fs/gfs2/ops_fstype.c
+++ b/trunk/fs/gfs2/ops_fstype.c
@@ -725,7 +725,7 @@ static int init_journal(struct gfs2_sbd *sdp, int undo)
 		goto fail;
 	}
 
-	error = -EINVAL;
+	error = -EUSERS;
 	if (!gfs2_jindex_size(sdp)) {
 		fs_err(sdp, "no journals!\n");
 		goto fail_jindex;