diff options
| author | Julia Lawall <julia.lawall@lip6.fr> | 2014-12-29 18:04:37 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-31 19:19:00 -0500 |
| commit | f12e77caf6c21588d6b24b5f1d8a6036f9ff9378 (patch) | |
| tree | 651c84d729996157c41a89149961e6fb8061a7e0 /drivers/net/ethernet/myricom | |
| parent | 8a0a1f840f6cc09c20963b1938cb3c976378783d (diff) | |
| download | linux-f12e77caf6c21588d6b24b5f1d8a6036f9ff9378.tar.bz2 | |
myri10ge: fix error return code
Return a negative error code on failure.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier ret; expression e1,e2;
@@
(
if (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
The patch also modifies the test of mgp->cmd to satisfy checkpatch.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/myricom')
| -rw-r--r-- | drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index af099057f0e9..71af98bb72cb 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -4033,8 +4033,10 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) (void)pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); mgp->cmd = dma_alloc_coherent(&pdev->dev, sizeof(*mgp->cmd), &mgp->cmd_bus, GFP_KERNEL); - if (mgp->cmd == NULL) + if (!mgp->cmd) { + status = -ENOMEM; goto abort_with_enabled; + } mgp->board_span = pci_resource_len(pdev, 0); mgp->iomem_base = pci_resource_start(pdev, 0); |