Merge branch 'master' into next

[linux-2.6-omap-h63xx.git] / drivers / staging / usbip / vhci_hcd.c

diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
index 5b5a2e348ecb86c434f59ccbf32d6797a73e3758..f69ca346aa2f5b5884925dd5fd4e3ea8c6c8a618 100644 (file)
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
@@ -1091,7 +1091,7 @@ static int vhci_hcd_probe(struct platform_device *pdev)
         * Allocate and initialize hcd.
         * Our private data is also allocated automatically.
         */
-       hcd = usb_create_hcd(&vhci_hc_driver, &pdev->dev, pdev->dev.bus_id);
+       hcd = usb_create_hcd(&vhci_hc_driver, &pdev->dev, dev_name(&pdev->dev));
        if (!hcd) {
                uerr("create hcd failed\n");
                return -ENOMEM;