From 260ae798011668aac2400f26a759cbe1f43e17e7 Mon Sep 17 00:00:00 2001
From: Toby Gray <toby.gray@realvnc.com>
Date: Thu, 2 Sep 2010 10:46:20 +0100
Subject: [PATCH] --- yaml --- r: 210229 b: refs/heads/master c:
 577045c0a76e34294f902a7d5d60e90b04d094d0 h: refs/heads/master i:   210227:
 219b6aa6197e9ef4858a3a4e57436cca93c97c0e v: v3

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

diff --git a/[refs] b/[refs]
index 9c8a77ae1e35..eb76ff8c5628 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b239f0aebd4dd6f85b13decf5e18e86e35d57f0
+refs/heads/master: 577045c0a76e34294f902a7d5d60e90b04d094d0
diff --git a/trunk/drivers/usb/class/cdc-acm.c b/trunk/drivers/usb/class/cdc-acm.c
index 597defc1d7bf..bc62fae0680f 100644
--- a/trunk/drivers/usb/class/cdc-acm.c
+++ b/trunk/drivers/usb/class/cdc-acm.c
@@ -965,7 +965,8 @@ static int acm_probe(struct usb_interface *intf,
 	}
 
 	if (!buflen) {
-		if (intf->cur_altsetting->endpoint->extralen &&
+		if (intf->cur_altsetting->endpoint &&
+				intf->cur_altsetting->endpoint->extralen &&
 				intf->cur_altsetting->endpoint->extra) {
 			dev_dbg(&intf->dev,
 				"Seeking extra descriptors on endpoint\n");