From 919eac58d2bd3ac2aea88e41dc3282513a068aaa Mon Sep 17 00:00:00 2001
From: Benoit Goby <benoit@android.com>
Date: Tue, 8 Jan 2013 19:57:09 -0800
Subject: [PATCH] --- yaml --- r: 349050 b: refs/heads/master c:
 b810075002c9f25a6da83cecda39d789000a04a9 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/usb/gadget/f_fs.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4d4499a2f20b..1ba38ac4ada3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6048e4c69d80600baba35856651056860d5d8f5a
+refs/heads/master: b810075002c9f25a6da83cecda39d789000a04a9
diff --git a/trunk/drivers/usb/gadget/f_fs.c b/trunk/drivers/usb/gadget/f_fs.c
index 4a6961c517f2..8c2f25121149 100644
--- a/trunk/drivers/usb/gadget/f_fs.c
+++ b/trunk/drivers/usb/gadget/f_fs.c
@@ -1153,15 +1153,15 @@ static int ffs_fs_parse_opts(struct ffs_sb_fill_data *data, char *opts)
 					pr_err("%s: unmapped value: %lu\n", opts, value);
 					return -EINVAL;
 				}
-			}
-			else if (!memcmp(opts, "gid", 3))
+			} else if (!memcmp(opts, "gid", 3)) {
 				data->perms.gid = make_kgid(current_user_ns(), value);
 				if (!gid_valid(data->perms.gid)) {
 					pr_err("%s: unmapped value: %lu\n", opts, value);
 					return -EINVAL;
 				}
-			else
+			} else {
 				goto invalid;
+			}
 			break;
 
 		default: