summaryrefslogtreecommitdiffstats
path: root/drivers/usb/dwc2/core.c
diff options
context:
space:
mode:
authorRussell King2014-04-04 01:33:49 +0200
committerRussell King2014-04-04 01:33:49 +0200
commitbce5669be3a8946952258a064ef26defeb887138 (patch)
tree117386b9909882c000f822011c5ea6fdcbab3273 /drivers/usb/dwc2/core.c
parentMerge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unst... (diff)
parentMerge branch 'uprobes-v7' of git://git.linaro.org/people/dave.long/linux into... (diff)
downloadkernel-qcow2-linux-bce5669be3a8946952258a064ef26defeb887138.tar.gz
kernel-qcow2-linux-bce5669be3a8946952258a064ef26defeb887138.tar.xz
kernel-qcow2-linux-bce5669be3a8946952258a064ef26defeb887138.zip
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'drivers/usb/dwc2/core.c')
-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);