From 585dce51865b3897cf1c9ef8220a042f49e9cfd2 Mon Sep 17 00:00:00 2001
From: Roger Quadros <roger.quadros@nokia.com>
Date: Wed, 8 Sep 2010 13:48:44 +0300
Subject: [PATCH] --- yaml --- r: 213566 b: refs/heads/master c:
 5c836e4d583701a5eecb288b5f131da39115f5ec h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c29f34d29b3a..25cce61a52d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3df7169e73fc1d71a39cffeacc969f6840cdf52b
+refs/heads/master: 5c836e4d583701a5eecb288b5f131da39115f5ec
diff --git a/trunk/drivers/usb/gadget/composite.c b/trunk/drivers/usb/gadget/composite.c
index 5e2bd7428424..7b5cc16e4a0b 100644
--- a/trunk/drivers/usb/gadget/composite.c
+++ b/trunk/drivers/usb/gadget/composite.c
@@ -928,7 +928,8 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
 		 */
 		switch (ctrl->bRequestType & USB_RECIP_MASK) {
 		case USB_RECIP_INTERFACE:
-			f = cdev->config->interface[intf];
+			if (cdev->config)
+				f = cdev->config->interface[intf];
 			break;
 
 		case USB_RECIP_ENDPOINT: