Commit 0968a9d1 authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by David S. Miller

drivers/net/ethernet/sis/sis900.c: fix error return code

The function sis900_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 err_out_cleardev:. Fore 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.

This was found by Coccinelle, but the code change was made by hand.
This patch is not robot generated.

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: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52428d91
...@@ -478,8 +478,10 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev, ...@@ -478,8 +478,10 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
/* IO region. */ /* IO region. */
ioaddr = pci_iomap(pci_dev, 0, 0); ioaddr = pci_iomap(pci_dev, 0, 0);
if (!ioaddr) if (!ioaddr) {
ret = -ENOMEM;
goto err_out_cleardev; goto err_out_cleardev;
}
sis_priv = netdev_priv(net_dev); sis_priv = netdev_priv(net_dev);
sis_priv->ioaddr = ioaddr; sis_priv->ioaddr = ioaddr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment