Commit 474799f0 authored Apr 22, 2016 by Heikki Krogerus Committed by Felipe Balbi Apr 28, 2016

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>

parent ae411413

drivers/usb/dwc3/dwc3-pci.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -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");