From 857c6356e4d0eebfcecfca7204742169d8575a3e Mon Sep 17 00:00:00 2001
From: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Date: Wed, 28 Mar 2012 09:30:50 +0200
Subject: [PATCH] --- yaml --- r: 299424 b: refs/heads/master c:
 92b0abf80c5c5f0e0d71d1309688a330fd74731b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c204deea0d46..73a3e1422f2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6190c79df861d2c78a7448fe6d4260e5fa53b9b9
+refs/heads/master: 92b0abf80c5c5f0e0d71d1309688a330fd74731b
diff --git a/trunk/drivers/usb/gadget/f_fs.c b/trunk/drivers/usb/gadget/f_fs.c
index d187ae73262b..f52cb1ae45d9 100644
--- a/trunk/drivers/usb/gadget/f_fs.c
+++ b/trunk/drivers/usb/gadget/f_fs.c
@@ -712,7 +712,7 @@ static long ffs_ep0_ioctl(struct file *file, unsigned code, unsigned long value)
 	if (code == FUNCTIONFS_INTERFACE_REVMAP) {
 		struct ffs_function *func = ffs->func;
 		ret = func ? ffs_func_revmap_intf(func, value) : -ENODEV;
-	} else if (gadget->ops->ioctl) {
+	} else if (gadget && gadget->ops->ioctl) {
 		ret = gadget->ops->ioctl(gadget, code, value);
 	} else {
 		ret = -ENOTTY;