Skip to content

Commit

Permalink
USB: ehci-fsl: Return valid error in ehci_fsl_setup_phy
Browse files Browse the repository at this point in the history
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 3735ba8 ("powerpc/usb: fix bug of CPU hang
when missing USB PHY clock"), which missed one return.

Signed-off-by: Ben Collins <[email protected]>
Cc: Shengzhou Liu <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Ben Collins authored and torvalds committed Oct 19, 2012
1 parent e2a666d commit d479c91
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-fsl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down

0 comments on commit d479c91

Please sign in to comment.