提交 5b896029 编写于 作者: P Peter Senna Tschudin 提交者: David S. Miller

drivers/net/ethernet/dec/tulip/dmfe.c: fix error return code

The function dmfe_init_one() return 0 for success and negative value
for most of its internal tests failures. There are three exceptions
that are error cases going to err_out_*:. Fore this three cases the
function abort its success execution path, but returns non negative
value, making it dificult for a caller function to notice the error.

This patch fixes the error cases that do not return negative values.

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: NPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 acb600de
...@@ -446,13 +446,17 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev, ...@@ -446,13 +446,17 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
/* Allocate Tx/Rx descriptor memory */ /* Allocate Tx/Rx descriptor memory */
db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) * db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) *
DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr); DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr);
if (!db->desc_pool_ptr) if (!db->desc_pool_ptr) {
err = -ENOMEM;
goto err_out_res; goto err_out_res;
}
db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC * db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC *
TX_DESC_CNT + 4, &db->buf_pool_dma_ptr); TX_DESC_CNT + 4, &db->buf_pool_dma_ptr);
if (!db->buf_pool_ptr) if (!db->buf_pool_ptr) {
err = -ENOMEM;
goto err_out_free_desc; goto err_out_free_desc;
}
db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr; db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr;
db->first_tx_desc_dma = db->desc_pool_dma_ptr; db->first_tx_desc_dma = db->desc_pool_dma_ptr;
...@@ -462,8 +466,10 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev, ...@@ -462,8 +466,10 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
db->chip_id = ent->driver_data; db->chip_id = ent->driver_data;
/* IO type range. */ /* IO type range. */
db->ioaddr = pci_iomap(pdev, 0, 0); db->ioaddr = pci_iomap(pdev, 0, 0);
if (!db->ioaddr) if (!db->ioaddr) {
err = -ENOMEM;
goto err_out_free_buf; goto err_out_free_buf;
}
db->chip_revision = pdev->revision; db->chip_revision = pdev->revision;
db->wol_mode = 0; db->wol_mode = 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册