diff options
Diffstat (limited to 'drivers/usb/dwc2/core_intr.c')
-rw-r--r-- | drivers/usb/dwc2/core_intr.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c index 5b228ba6045f..b8bcb007c92a 100644 --- a/drivers/usb/dwc2/core_intr.c +++ b/drivers/usb/dwc2/core_intr.c | |||
@@ -159,9 +159,8 @@ static void dwc2_handle_otg_intr(struct dwc2_hsotg *hsotg) | |||
159 | " ++OTG Interrupt: Session Request Success Status Change++\n"); | 159 | " ++OTG Interrupt: Session Request Success Status Change++\n"); |
160 | gotgctl = dwc2_readl(hsotg->regs + GOTGCTL); | 160 | gotgctl = dwc2_readl(hsotg->regs + GOTGCTL); |
161 | if (gotgctl & GOTGCTL_SESREQSCS) { | 161 | if (gotgctl & GOTGCTL_SESREQSCS) { |
162 | if (hsotg->params.phy_type == | 162 | if (hsotg->params.phy_type == DWC2_PHY_TYPE_PARAM_FS && |
163 | DWC2_PHY_TYPE_PARAM_FS | 163 | hsotg->params.i2c_enable) { |
164 | && hsotg->params.i2c_enable > 0) { | ||
165 | hsotg->srp_success = 1; | 164 | hsotg->srp_success = 1; |
166 | } else { | 165 | } else { |
167 | /* Clear Session Request */ | 166 | /* Clear Session Request */ |
@@ -317,7 +316,7 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg) | |||
317 | dwc2_writel(GINTSTS_SESSREQINT, hsotg->regs + GINTSTS); | 316 | dwc2_writel(GINTSTS_SESSREQINT, hsotg->regs + GINTSTS); |
318 | 317 | ||
319 | dev_dbg(hsotg->dev, "Session request interrupt - lx_state=%d\n", | 318 | dev_dbg(hsotg->dev, "Session request interrupt - lx_state=%d\n", |
320 | hsotg->lx_state); | 319 | hsotg->lx_state); |
321 | 320 | ||
322 | if (dwc2_is_device_mode(hsotg)) { | 321 | if (dwc2_is_device_mode(hsotg)) { |
323 | if (hsotg->lx_state == DWC2_L2) { | 322 | if (hsotg->lx_state == DWC2_L2) { |
@@ -437,7 +436,7 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg) | |||
437 | /* Ignore suspend request before enumeration */ | 436 | /* Ignore suspend request before enumeration */ |
438 | if (!dwc2_is_device_connected(hsotg)) { | 437 | if (!dwc2_is_device_connected(hsotg)) { |
439 | dev_dbg(hsotg->dev, | 438 | dev_dbg(hsotg->dev, |
440 | "ignore suspend request before enumeration\n"); | 439 | "ignore suspend request before enumeration\n"); |
441 | return; | 440 | return; |
442 | } | 441 | } |
443 | 442 | ||
@@ -445,7 +444,7 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg) | |||
445 | if (ret) { | 444 | if (ret) { |
446 | if (ret != -ENOTSUPP) | 445 | if (ret != -ENOTSUPP) |
447 | dev_err(hsotg->dev, | 446 | dev_err(hsotg->dev, |
448 | "enter hibernation failed\n"); | 447 | "enter hibernation failed\n"); |
449 | goto skip_power_saving; | 448 | goto skip_power_saving; |
450 | } | 449 | } |
451 | 450 | ||