aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2014-11-20 18:34:01 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-24 17:22:38 -0800
commit0bfed505447dd5a47e6097a32d216d7df7cf70aa (patch)
tree21d1de592f070e89136a4b507c7862bb1e1228b3 /drivers/usb/host
parentstorage: Fix bus scan and multi-LUN support for SCM eUSCSI devices (diff)
downloadlinux-dev-0bfed505447dd5a47e6097a32d216d7df7cf70aa.tar.xz
linux-dev-0bfed505447dd5a47e6097a32d216d7df7cf70aa.zip
host: ehci-w90x900: fix error return code
Return a negative error code on failure. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ identifier ret; expression e1,e2; @@ ( if (\(ret < 0\|ret != 0\)) { ... return ret; } | ret = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ehci-w90x900.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-w90x900.c b/drivers/usb/host/ehci-w90x900.c
index 4717bf207595..c305732e8634 100644
--- a/drivers/usb/host/ehci-w90x900.c
+++ b/drivers/usb/host/ehci-w90x900.c
@@ -75,8 +75,10 @@ static int usb_w90x900_probe(const struct hc_driver *driver,
__raw_writel(val, ehci->regs+PHY1_CTR);
irq = platform_get_irq(pdev, 0);
- if (irq < 0)
+ if (irq < 0) {
+ retval = irq;
goto err2;
+ }
retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (retval != 0)