1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 8bdaa157ffe7..eb4ac47612a5 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1641,7 +1641,13 @@ free_interfaces:
                                 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);