Skip to content

Commit

Permalink
drivers/net/irda/mcs7780.c: fix error return code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Senna Tschudin authored and David S. Miller committed Oct 7, 2012
1 parent 8728647 commit 6734011
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/net/irda/mcs7780.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 6734011

Please sign in to comment.