diff options
author | Peter Senna Tschudin <peter.senna@gmail.com> | 2012-10-05 10:41:04 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-10-07 14:37:04 -0400 |
commit | 52428d9169f8b4c26e806fb7473833bce3077de5 (patch) | |
tree | 999e3d2e1a7b8c9dd9ae5ff1566e9a31959d67f9 /drivers/net/ethernet/natsemi | |
parent | 5b896029e9c4c9fd67eed80b7400dd68bdd93f52 (diff) | |
download | linux-52428d9169f8b4c26e806fb7473833bce3077de5.tar.gz linux-52428d9169f8b4c26e806fb7473833bce3077de5.tar.bz2 linux-52428d9169f8b4c26e806fb7473833bce3077de5.zip |
drivers/net/ethernet/natsemi/natsemi.c: fix error return code
The function natsemi_probe1() 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_create_file:. 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: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/natsemi')
-rw-r--r-- | drivers/net/ethernet/natsemi/natsemi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c index 5b61d12f8b91..dbaaa99a0d43 100644 --- a/drivers/net/ethernet/natsemi/natsemi.c +++ b/drivers/net/ethernet/natsemi/natsemi.c @@ -947,8 +947,8 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, i = register_netdev(dev); if (i) goto err_register_netdev; - - if (NATSEMI_CREATE_FILE(pdev, dspcfg_workaround)) + i = NATSEMI_CREATE_FILE(pdev, dspcfg_workaround); + if (i) goto err_create_file; if (netif_msg_drv(np)) { |