mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 17:12:06 +00:00
drivers/net/ethernet/sun/sungem.c: fix error return code
The function gem_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_consistent:. 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>
This commit is contained in:
parent
8c65ef4b8a
commit
4df128341e
@ -2963,7 +2963,8 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
|
||||
goto err_out_iounmap;
|
||||
}
|
||||
|
||||
if (gem_get_device_address(gp))
|
||||
err = gem_get_device_address(gp);
|
||||
if (err)
|
||||
goto err_out_free_consistent;
|
||||
|
||||
dev->netdev_ops = &gem_netdev_ops;
|
||||
|
Loading…
Reference in New Issue
Block a user