summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Collins <ben.c@servergy.com>2012-10-19 10:24:12 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-19 10:54:30 -0700
commitd479c911789e14a19b86ca09b0b634f1449c8c6b (patch)
treed45a3ca9d4d3fd583a1e0788425c870330956a41
parente2a666d52b4825c26c857cada211f3baac26a600 (diff)
downloadlinux-3.10-d479c911789e14a19b86ca09b0b634f1449c8c6b.tar.gz
linux-3.10-d479c911789e14a19b86ca09b0b634f1449c8c6b.tar.bz2
linux-3.10-d479c911789e14a19b86ca09b0b634f1449c8c6b.zip
USB: ehci-fsl: Return valid error in ehci_fsl_setup_phy
ehci_fsl_setup_phy is supposed to return an int, but had a void return value in the case of controller_ver being invalid. Introduced by commit 3735ba8db8e6 ("powerpc/usb: fix bug of CPU hang when missing USB PHY clock"), which missed one return. Signed-off-by: Ben Collins <ben.c@servergy.com> Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/usb/host/ehci-fsl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index 9bfde82078e..0d2f35ca93f 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -222,7 +222,7 @@ static int ehci_fsl_setup_phy(struct usb_hcd *hcd,
if (pdata->controller_ver < 0) {
dev_warn(hcd->self.controller, "Could not get controller version\n");
- return;
+ return -ENODEV;
}
portsc = ehci_readl(ehci, &ehci->regs->port_status[port_offset]);