[PATCH] USB: fixed the interface names to have the proper bus id.

Thanks to David Brownell for pointing out where my previous patch was wrong.

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index f1884e5ec9c203262437b038c29cd5f2ec8ba0b5..4f53715471fb4ecead7243b9db0231edeb05d0ef 100644 (file)
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -947,8 +947,8 @@ static void usb_find_drivers(struct usb_device *dev)
                /* register this interface with driverfs */
                interface->dev.parent = &dev->dev;
                interface->dev.bus = &usb_bus_type;
-               sprintf (&interface->dev.bus_id[0], "%s:%d",
-                        dev->devpath,
+               sprintf (&interface->dev.bus_id[0], "%s-%s:%d",
+                        dev->bus->bus_name, dev->devpath,
                         interface->altsetting->bInterfaceNumber);
                if (!desc->iInterface
                                || usb_string (dev, desc->iInterface,