From 0638893739fae901edc02b99567921e699e12ccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
Date: Mon, 21 Jan 2013 05:50:40 +0000
Subject: [PATCH] --- yaml --- r: 349243 b: refs/heads/master c:
 6b4ef60299e30daa8643218fde6152d8a01e2d4b h: refs/heads/master i:   349241:
 b46e9c15f06581f1c8017bca8a944aef1ed2b4ec   349239:
 e5df646355ef22e077ca9e2e9246df6b10598bea v: v3

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

diff --git a/[refs] b/[refs]
index 38f3e3f0d265..c66d47744164 100644
--- 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
index 4041159f6c98..2c4b41ffddb6 100644
--- 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;