Commit f7ffaa6f authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman
Browse files

usb: core: acpi: Use the sysdev pointer instead of controller device 



The controller device (hcd) does not always have the ACPI
companion assigned to it at all. We can not rely on it when
finding the ACPI companion for the root hub. Instead we need
to use the sysdev pointer.

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20220428111056.3558-2-heikki.krogerus@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9a922c04

drivers/usb/core/usb-acpi.c

+5 −2
Original line number Diff line number Diff line
@@ -205,8 +205,11 @@ usb_acpi_find_companion_for_device(struct usb_device *udev) 
	struct usb_hub *hub;



	if (!udev->parent) {

		/* root hub is only child (_ADR=0) under its parent, the HC */

		adev = ACPI_COMPANION(udev->dev.parent);

		/*

		 * root hub is only child (_ADR=0) under its parent, the HC.

		 * sysdev pointer is the HC as seen from firmware.

		 */

		adev = ACPI_COMPANION(udev->bus->sysdev);

		return acpi_find_child_device(adev, 0, false);

	}