From 1932a624b3e1d3aad5d15c67a86116da4401d111 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Sat, 29 Jan 2011 02:26:51 +0100
Subject: [PATCH] --- yaml --- r: 233131 b: refs/heads/master c:
 a283c03a3a7a8cd3f8836ffd1b1d6cc8f778492c h: refs/heads/master i:   233129:
 24f3106743096ade83924160d8bb6b0d55e81169   233127:
 ee471a3a8b1126dbd3c1ae399bd1d54756efc965 v: v3

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

diff --git a/[refs] b/[refs]
index 3edadc685c2d..756e02a1b699 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cf28f1f4de58c70e6af657bb46ca8f304c073d4
+refs/heads/master: a283c03a3a7a8cd3f8836ffd1b1d6cc8f778492c
diff --git a/trunk/drivers/usb/gadget/f_mass_storage.c b/trunk/drivers/usb/gadget/f_mass_storage.c
index b5dbb2308f56..6d8e533949eb 100644
--- a/trunk/drivers/usb/gadget/f_mass_storage.c
+++ b/trunk/drivers/usb/gadget/f_mass_storage.c
@@ -293,6 +293,7 @@
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <linux/usb/composite.h>
 
 #include "gadget_chips.h"
 
@@ -2763,7 +2764,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
 			return ERR_PTR(-ENOMEM);
 		common->free_storage_on_release = 1;
 	} else {
-		memset(common, 0, sizeof common);
+		memset(common, 0, sizeof *common);
 		common->free_storage_on_release = 0;
 	}