summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2012-10-05 12:40:53 +0000
committerDavid S. Miller <davem@davemloft.net>2012-10-07 14:37:12 -0400
commit8c65ef4b8a21ab7edc7f35bb9a3892b0051b0158 (patch)
treed262665d93dd7a15ddb8cfc4d45ad884f0094760 /drivers
parent043c4789726e6abb5be6115cb054af4926481952 (diff)
downloadlinux-8c65ef4b8a21ab7edc7f35bb9a3892b0051b0158.tar.gz
linux-8c65ef4b8a21ab7edc7f35bb9a3892b0051b0158.tar.bz2
linux-8c65ef4b8a21ab7edc7f35bb9a3892b0051b0158.zip
drivers/net/ethernet/sun/niu.c: fix error return code
The function niu_pci_init_one() 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_free_res:. 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. 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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/sun/niu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 8419bf385e08..275b430aeb75 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -9788,6 +9788,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
if (!pci_is_pcie(pdev)) {
dev_err(&pdev->dev, "Cannot find PCI Express capability, aborting\n");
+ err = -ENODEV;
goto err_out_free_res;
}