---

yaml --- r: 56838 b: refs/heads/master c: 57a21c1 h: refs/heads/master v: v3
git-mirror · May 23, 2007 · d29a667 · d29a667
1 parent 87209d8
commit d29a667
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b89ee19ae6c0b5a0d9facca780b53959fbadd123
+refs/heads/master: 57a21c1b929450b1e020c0a03cca6fa7448f4222
diff --git a/trunk/drivers/usb/core/config.c b/trunk/drivers/usb/core/config.c
@@ -185,10 +185,12 @@ static int usb_parse_interface(struct device *ddev, int cfgno,
 		num_ep = USB_MAXENDPOINTS;
 	}
 
-	len = sizeof(struct usb_host_endpoint) * num_ep;
-	alt->endpoint = kzalloc(len, GFP_KERNEL);
-	if (!alt->endpoint)
-		return -ENOMEM;
+	if (num_ep > 0) {	/* Can't allocate 0 bytes */
+		len = sizeof(struct usb_host_endpoint) * num_ep;
+		alt->endpoint = kzalloc(len, GFP_KERNEL);
+		if (!alt->endpoint)
+			return -ENOMEM;
+	}
 
 	/* Parse all the endpoint descriptors */
 	n = 0;