2021-05-28 08:23:47

by Phil Elwell

Subject: [PATCH] usb: dwc2: Fix build in periphal-only mode

The bus_suspended member of struct dwc2_hsotg is only present in builds
that support host-mode.

Fixes: 62bb46f51f91 ("usb: dwc2: Fix hibernation between host and device modes.")
Signed-off-by: Phil Elwell <[email protected]>
---
drivers/usb/dwc2/core_intr.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
index a5ab03808da6..03d0c034cf57 100644
--- a/drivers/usb/dwc2/core_intr.c
+++ b/drivers/usb/dwc2/core_intr.c
@@ -725,7 +725,11 @@ static inline void dwc_handle_gpwrdn_disc_det(struct dwc2_hsotg *hsotg,
dwc2_writel(hsotg, gpwrdn_tmp, GPWRDN);

hsotg->hibernated = 0;
+
+#if IS_ENABLED(CONFIG_USB_DWC2_HOST) || \
+ IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
hsotg->bus_suspended = 0;
+#endif

if (gpwrdn & GPWRDN_IDSTS) {
hsotg->op_state = OTG_STATE_B_PERIPHERAL;
--
2.25.1

2021-05-28 11:37:33

by Greg Kroah-Hartman

Subject: Re: [PATCH] usb: dwc2: Fix build in periphal-only mode

On Fri, May 28, 2021 at 09:18:18AM +0100, Phil Elwell wrote:
> The bus_suspended member of struct dwc2_hsotg is only present in builds
> that support host-mode.
>
> Fixes: 62bb46f51f91 ("usb: dwc2: Fix hibernation between host and device modes.")

That commit id is not in Linus's tree :(

Please fix it with the real commit id and resend.

thanks,

greg k-h