diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-27 09:23:49 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-27 09:23:49 +0000 |
| commit | 3396b3372e61f8b579395e32c53212612b14daff (patch) | |
| tree | 6e863b97cc8eb2e0f52d02b0520720ea443b6d58 /drivers/usb/core | |
| parent | 6acba0345b68772830582ca1ca369a2f45631275 (diff) | |
| parent | 2cc14f52aeb78ce3f29677c2de1f06c0e91471ab (diff) | |
| download | linux-stable-3396b3372e61f8b579395e32c53212612b14daff.tar.gz linux-stable-3396b3372e61f8b579395e32c53212612b14daff.tar.bz2 linux-stable-3396b3372e61f8b579395e32c53212612b14daff.zip | |
Merge 6.7-rc3 into usb-next
We need the USB/PHY/Thunderbolt fixes in here as well for later patches
to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/config.c | 3 | ||||
| -rw-r--r-- | drivers/usb/core/hub.c | 23 |
2 files changed, 2 insertions, 24 deletions
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index b19e38d5fd10..7f8d33f92ddb 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c @@ -1047,7 +1047,7 @@ int usb_get_bos_descriptor(struct usb_device *dev) if (cap->bDescriptorType != USB_DT_DEVICE_CAPABILITY) { dev_notice(ddev, "descriptor type invalid, skip\n"); - continue; + goto skip_to_next_descriptor; } switch (cap_type) { @@ -1078,6 +1078,7 @@ int usb_get_bos_descriptor(struct usb_device *dev) break; } +skip_to_next_descriptor: total_len -= length; buffer += length; } diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 756fbd7cac43..5a60e3c7d8ef 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -628,29 +628,6 @@ static int hub_ext_port_status(struct usb_hub *hub, int port1, int type, ret = 0; } mutex_unlock(&hub->status_mutex); - - /* - * There is no need to lock status_mutex here, because status_mutex - * protects hub->status, and the phy driver only checks the port - * status without changing the status. - */ - if (!ret) { - struct usb_device *hdev = hub->hdev; - - /* - * Only roothub will be notified of port state changes, - * since the USB PHY only cares about changes at the next - * level. - */ - if (is_root_hub(hdev)) { - struct usb_hcd *hcd = bus_to_hcd(hdev->bus); - - if (hcd->usb_phy) - usb_phy_notify_port_status(hcd->usb_phy, - port1 - 1, *status, *change); - } - } - return ret; } |