usb: fix ->update_hub_device() vs hdev->maxchild (e3d95580) · Commits · 戴 / test

Commit "usb: assign default peer ports for root hubs" delayed marking a hub valid (set hdev->maxchild) until it had been fully configured and to enable the publishing of valid hubs to be serialized by usb_port_peer_mutex. However, xhci_update_hub_device() in some cases depends on hdev->maxchild already being set. Do the minimal fix and move it after the setting of hdev->maxchild. Cc: Mathias Nyman <mathias.nyman@linux.intel.com> Reported-by:

Valdis Kletnieks <Valdis.Kletnieks@vt.edu> Tested-by:

Valdis Kletnieks <Valdis.Kletnieks@vt.edu> Signed-off-by:

Dan Williams <dan.j.williams@intel.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/core/hub.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -1526,18 +1526,6 @@ static int hub_configure(struct usb_hub *hub,
		dev_dbg(hub_dev, "%umA bus power budget for each child\n",
		hub->mA_per_port);

		/* Update the HCD's internal representation of this hub before khubd
		* starts getting port status changes for devices under the hub.
		*/
		if (hcd->driver->update_hub_device) {
		ret = hcd->driver->update_hub_device(hcd, hdev,
		&hub->tt, GFP_KERNEL);
		if (ret < 0) {
		message = "can't update HCD hub info";
		goto fail;
		}
		}

		ret = hub_hub_status(hub, &hubstatus, &hubchange);
		if (ret < 0) {
		message = "can't get hub status";
		@@ -1593,6 +1581,18 @@ static int hub_configure(struct usb_hub *hub,
		if (ret < 0)
		goto fail;

		/* Update the HCD's internal representation of this hub before khubd
		* starts getting port status changes for devices under the hub.
		*/
		if (hcd->driver->update_hub_device) {
		ret = hcd->driver->update_hub_device(hcd, hdev,
		&hub->tt, GFP_KERNEL);
		if (ret < 0) {
		message = "can't update HCD hub info";
		goto fail;
		}
		}

		usb_hub_adjust_deviceremovable(hdev, hub->descriptor);

		hub_activate(hub, HUB_INIT);

Admin message