diff --git a/[refs] b/[refs]
index 73f029a8496e..f889f1a4a579 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b22817b3c81cdb18ffe3d2debfee968731a8b5f4
+refs/heads/master: 439a903a9663c0caa8094f3907ca60069d6c36e7
diff --git a/trunk/drivers/usb/core/message.c b/trunk/drivers/usb/core/message.c
index 8bdaa157ffe7..eb4ac47612a5 100644
--- a/trunk/drivers/usb/core/message.c
+++ b/trunk/drivers/usb/core/message.c
@@ -1641,7 +1641,13 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
 				intf->dev.bus_id, ret);
 			continue;
 		}
-		usb_create_sysfs_intf_files (intf);
+
+		/* The driver's probe method can call usb_set_interface(),
+		 * which would mean the interface's sysfs files are already
+		 * created.  Just in case, we'll remove them first.
+		 */
+		usb_remove_sysfs_intf_files(intf);
+		usb_create_sysfs_intf_files(intf);
 	}
 
 	usb_autosuspend_device(dev);