From 41b6c2bee8ff267a6a3dcd73b0553678d1e4cc8e Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Fri, 1 Jul 2011 16:43:02 -0400
Subject: [PATCH] --- yaml --- r: 254600 b: refs/heads/master c:
 e534c5b831c8b8e9f5edee5c8a37753c808b80dc h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/core/message.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9ee726128c79..8e38fba63176 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3140d5b2664309253ba465a14c89fe4f59c0359b
+refs/heads/master: e534c5b831c8b8e9f5edee5c8a37753c808b80dc
diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c
index 64c7ab4702df..e0719b4ee189 100644
--- a/trunk/drivers/usb/core/message.c
+++ b/trunk/drivers/usb/core/message.c
@@ -1286,6 +1286,8 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
 			interface);
 		return -EINVAL;
 	}
+	if (iface->unregistering)
+		return -ENODEV;
 
 	alt = usb_altnum_to_altsetting(iface, alternate);
 	if (!alt) {