---

yaml --- r: 349243 b: refs/heads/master c: 6b4ef60 h: refs/heads/master i: 349241: b46e9c1 349239: e5df646 v: v3
git-mirror · Jan 21, 2013 · 0638893 · 0638893
1 parent 3176ed4
commit 0638893
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 328d7b8a4ab045484e1cc09579abf13c8c6223e3
+refs/heads/master: 6b4ef60299e30daa8643218fde6152d8a01e2d4b
diff --git a/trunk/drivers/net/usb/cdc_ncm.c b/trunk/drivers/net/usb/cdc_ncm.c
@@ -524,7 +524,8 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
 error2:
 	usb_set_intfdata(ctx->control, NULL);
 	usb_set_intfdata(ctx->data, NULL);
-	usb_driver_release_interface(driver, ctx->data);
+	if (ctx->data != ctx->control)
+		usb_driver_release_interface(driver, ctx->data);
 error:
 	cdc_ncm_free((struct cdc_ncm_ctx *)dev->data[0]);
 	dev->data[0] = 0;