summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorPaul Zimmerman2014-02-04 20:42:15 +0100
committerGreg Kroah-Hartman2014-02-04 21:59:14 +0100
commita23666c49938bba08df3654fc66cd051587f7673 (patch)
tree7c5826b0028216054563182882c04b968edfcf50 /drivers/usb
parentusb: dwc2: bail out early when booting with "nousb" (diff)
downloadkernel-qcow2-linux-a23666c49938bba08df3654fc66cd051587f7673.tar.gz
kernel-qcow2-linux-a23666c49938bba08df3654fc66cd051587f7673.tar.xz
kernel-qcow2-linux-a23666c49938bba08df3654fc66cd051587f7673.zip
usb: dwc2: fix role switch breakage
Commit beb7e592bc "staging: dwc2: add check on dwc2_core_reset return" broke the B -> A role switching on OTG-enabled platforms. This commit fixes it. Reported-by: Dinh Nguyen <dinguyen@altera.com> Tested-by: Dinh Nguyen <dinguyen@altera.com> Signed-off-by: Paul Zimmerman <paulz@synopsys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/dwc2/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
index 8565d87f94b4..1d129884cc39 100644
--- a/drivers/usb/dwc2/core.c
+++ b/drivers/usb/dwc2/core.c
@@ -216,7 +216,7 @@ static int dwc2_hs_phy_init(struct dwc2_hsotg *hsotg, bool select_phy)
int retval = 0;
if (!select_phy)
- return -ENODEV;
+ return 0;
usbcfg = readl(hsotg->regs + GUSBCFG);