diff options
| author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2016-04-22 10:17:37 +0200 |
|---|---|---|
| committer | Felipe Balbi <felipe.balbi@linux.intel.com> | 2016-04-28 08:01:59 +0200 |
| commit | 474799f073763b868e158b04b74f8ddd1da38da2 (patch) | |
| tree | b26efcd3d2168609ad872c40cf10b488b2d5727c /drivers/usb/dwc3 | |
| parent | usb: dwc3: ep0: sanity check test mode selector (diff) | |
| download | linux-474799f073763b868e158b04b74f8ddd1da38da2.tar.xz linux-474799f073763b868e158b04b74f8ddd1da38da2.zip | |
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 <heikki.krogerus@linux.intel.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Diffstat (limited to 'drivers/usb/dwc3')
| -rw-r--r-- | drivers/usb/dwc3/dwc3-pci.c | 7 |
1 files changed, 4 insertions, 3 deletions
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"); |