Skip to content

Revert a commit to see if it helps with #7349 #7377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
pelwell wants to merge 1 commit into
base: rpi-6.18.y
Choose a base branch
from
+10 −6
Draft

Revert a commit to see if it helps with #7349 #7377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions drivers/usb/dwc2/hcd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3583,9 +3583,11 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
port_status |= USB_PORT_STAT_C_OVERCURRENT << 16;
}

if (dwc2_is_device_mode(hsotg)) {
if (!hsotg->flags.b.port_connect_status) {
/*
* Just return 0's for the remainder of the port status
* The port is disconnected, which means the core is
* either in device mode or it soon will be. Just
* return 0's for the remainder of the port status
* since the port register can't be read if the core
* is in device mode.
*/
Expand Down Expand Up @@ -3655,11 +3657,13 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
if (wvalue != USB_PORT_FEAT_TEST && (!windex || windex > 1))
goto error;

if (dwc2_is_device_mode(hsotg)) {
if (!hsotg->flags.b.port_connect_status) {
/*
* Just return 0's for the remainder of the port status
* since the port register can't be read if the core
* is in device mode.
* The port is disconnected, which means the core is
* either in device mode or it soon will be. Just
* return without doing anything since the port
* register can't be written if the core is in device
* mode.
*/
break;
}
Expand Down
Loading