diff options
| author | Vardan Mikayelyan | 2018-01-19 11:45:38 +0100 |
|---|---|---|
| committer | Felipe Balbi | 2018-03-13 09:47:44 +0100 |
| commit | a127cccd869b4418dcfaefe96bfa672287b32719 (patch) | |
| tree | be67a701f3ce2de2a9b0be85e8d15d1267dafc37 /drivers/usb/dwc2/pci.c | |
| parent | usb: dwc2: pci: Replace kzalloc() with devm_kzalloc() (diff) | |
| download | kernel-qcow2-linux-a127cccd869b4418dcfaefe96bfa672287b32719.tar.gz kernel-qcow2-linux-a127cccd869b4418dcfaefe96bfa672287b32719.tar.xz kernel-qcow2-linux-a127cccd869b4418dcfaefe96bfa672287b32719.zip | |
usb: dwc2: pci: Move usb_phy_generic_register()
Move usb_phy_generic_register() function call to the top, to simplify
error handling. If this fails we can simply return instead of cleaning
up.
Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Vardan Mikayelyan <mvardan@synopsys.com>
Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Grigor Tovmasyan <tovmasya@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Diffstat (limited to 'drivers/usb/dwc2/pci.c')
| -rw-r--r-- | drivers/usb/dwc2/pci.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/dwc2/pci.c b/drivers/usb/dwc2/pci.c index 8c6a65188412..11b8ffb6656b 100644 --- a/drivers/usb/dwc2/pci.c +++ b/drivers/usb/dwc2/pci.c @@ -104,6 +104,13 @@ static int dwc2_pci_probe(struct pci_dev *pci, pci_set_master(pci); + phy = usb_phy_generic_register(); + if (IS_ERR(phy)) { + dev_err(dev, "error registering generic PHY (%ld)\n", + PTR_ERR(phy)); + return PTR_ERR(phy); + } + dwc2 = platform_device_alloc("dwc2", PLATFORM_DEVID_AUTO); if (!dwc2) { dev_err(dev, "couldn't allocate dwc2 device\n"); @@ -129,13 +136,6 @@ static int dwc2_pci_probe(struct pci_dev *pci, dwc2->dev.parent = dev; - phy = usb_phy_generic_register(); - if (IS_ERR(phy)) { - dev_err(dev, "error registering generic PHY (%ld)\n", - PTR_ERR(phy)); - return PTR_ERR(phy); - } - ret = dwc2_pci_quirks(pci, dwc2); if (ret) goto err; |