From: Heikki Krogerus Date: Fri, 22 Apr 2016 08:17:37 +0000 (+0300) Subject: usb: dwc3: pci: make build-in device properties available X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=474799f073763b868e158b04b74f8ddd1da38da2;p=linux-beck.git usb: dwc3: pci: make build-in device properties available Setting the ACPI companion before calling dwc3_pci_quirks. The ACPI companion will be set unconditionally as the primary fwnode, overriding any previously set primary fwnode. This will make sure that any build-in properties added to the platform device will be added as the secondary fwnode in cases where also ACPI companion exists. Signed-off-by: Heikki Krogerus Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c index adc1e8a624cb..e444e9a1a0c8 100644 --- a/drivers/usb/dwc3/dwc3-pci.c +++ b/drivers/usb/dwc3/dwc3-pci.c @@ -170,13 +170,14 @@ static int dwc3_pci_probe(struct pci_dev *pci, } pci_set_drvdata(pci, dwc3); - ret = dwc3_pci_quirks(pci); - if (ret) - goto err; dwc3->dev.parent = dev; ACPI_COMPANION_SET(&dwc3->dev, ACPI_COMPANION(dev)); + ret = dwc3_pci_quirks(pci); + if (ret) + goto err; + ret = platform_device_add(dwc3); if (ret) { dev_err(dev, "failed to register dwc3 device\n");