diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index 74987276ac7368a8cbee0e1fda556a09db9f715e..19fbd6965630cac621657dda52c693b6e8725be2 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -2252,6 +2252,8 @@ struct usb_hcd *isp1760_register(phys_addr_t res_start, resource_size_t res_len,
 		goto err_unmap;
 	device_wakeup_enable(hcd->self.controller);
 
+	dev_set_drvdata(dev, hcd);
+
 	return hcd;
 
 err_unmap:
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index b96c62f40863c8f45ec48be89a41ab5b2dade360..64eaf5d0157ecfbe8503532dbde13c64e91987ab 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -146,7 +146,6 @@ static int isp1761_pci_probe(struct pci_dev *dev,
 	iounmap(iobase);
 	release_mem_region(nxp_pci_io_base, iolength);
 
-	pci_set_drvdata(dev, hcd);
 	return 0;
 
 cleanup3:
@@ -272,8 +271,6 @@ static int isp1760_plat_probe(struct platform_device *pdev)
 		goto cleanup;
 	}
 
-	platform_set_drvdata(pdev, hcd);
-
 	pr_info("ISP1760 USB device initialised\n");
 	return 0;