diff --git a/[refs] b/[refs] index eedf42fe5b65..268e8c70f69a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 427c4f333474f5447f62387c1fb060e586c1a781 +refs/heads/master: 74c71ebd8d7c7a513022851a02bb52b9fa7e0dcb diff --git a/trunk/drivers/usb/host/oxu210hp-hcd.c b/trunk/drivers/usb/host/oxu210hp-hcd.c index 251123c29d81..75548f7c716b 100644 --- a/trunk/drivers/usb/host/oxu210hp-hcd.c +++ b/trunk/drivers/usb/host/oxu210hp-hcd.c @@ -3825,7 +3825,7 @@ static int oxu_drv_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (!res) { dev_err(&pdev->dev, - "no IRQ! Check %s setup!\n", pdev->dev.bus_id); + "no IRQ! Check %s setup!\n", dev_name(&pdev->dev)); return -ENODEV; } irq = res->start; @@ -3834,7 +3834,7 @@ static int oxu_drv_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { dev_err(&pdev->dev, "no registers address! Check %s setup!\n", - pdev->dev.bus_id); + dev_name(&pdev->dev)); return -ENODEV; } memstart = res->start; @@ -3893,7 +3893,7 @@ static int oxu_drv_probe(struct platform_device *pdev) error_ioremap: release_mem_region(memstart, memlen); - dev_err(&pdev->dev, "init %s fail, %d\n", pdev->dev.bus_id, ret); + dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev), ret); return ret; }