diff options
author | Peter Senna Tschudin <peter.senna@gmail.com> | 2012-10-05 11:33:04 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-10-07 18:37:11 (GMT) |
commit | 6734011f3c9a17070f157656f8b15e051e37aee1 (patch) | |
tree | b0b4f3412ec1c75771ab508a6c2de244e7011c2a | |
parent | 87286477c4688e5324e24916a1b2da4972ea84ba (diff) | |
download | linux-fsl-qoriq-6734011f3c9a17070f157656f8b15e051e37aee1.tar.xz |
drivers/net/irda/mcs7780.c: fix error return code
The function mcs_probe() return 0 for success and negative value
for most of its internal tests failures. There is one exception
that is error case going to error2:. For this error case, the
function abort its success execution path, but returns non negative
value, making it difficult for a caller function to notice the error.
This patch fixes the error case that do not return negative value.
A simplified version of the semantic match that finds this problem is
as follows: (http://coccinelle.lip6.fr/)
// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/irda/mcs7780.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c index 1a00b59..f07c340 100644 --- a/drivers/net/irda/mcs7780.c +++ b/drivers/net/irda/mcs7780.c @@ -920,8 +920,10 @@ static int mcs_probe(struct usb_interface *intf, ndev->netdev_ops = &mcs_netdev_ops; - if (!intf->cur_altsetting) + if (!intf->cur_altsetting) { + ret = -ENOMEM; goto error2; + } ret = mcs_find_endpoints(mcs, intf->cur_altsetting->endpoint, intf->cur_altsetting->desc.bNumEndpoints); |