lkml.org 
[lkml]   [2021]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 107/137] usb: dwc2: Fix build in periphal-only mode
    Date
    From: Phil Elwell <phil@raspberrypi.com>

    In branches to which 24d209dba5a3 ("usb: dwc2: Fix hibernation between
    host and device modes.") has been back-ported, the bus_suspended member
    of struct dwc2_hsotg is only present in builds that support host-mode.
    To avoid having to pull in several more non-Fix commits in order to
    get it to compile, wrap the usage of the member in a macro conditional.

    Fixes: 24d209dba5a3 ("usb: dwc2: Fix hibernation between host and device modes.")
    Signed-off-by: Phil Elwell <phil@raspberrypi.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/dwc2/core_intr.c | 4 ++++
    1 file changed, 4 insertions(+)

    --- a/drivers/usb/dwc2/core_intr.c
    +++ b/drivers/usb/dwc2/core_intr.c
    @@ -707,7 +707,11 @@ static inline void dwc_handle_gpwrdn_dis
    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;

    \
     
     \ /
      Last update: 2021-06-08 21:10    [W:4.137 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site