aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2013-12-29 17:47:20 -0500
committerRoland Dreier <roland@purestorage.com>2014-01-18 16:51:33 -0500
commitaf2e2e35a23e4aeecfe4332a7140c81e0f09b7e3 (patch)
treecaf068265243ca5eeefc0455b34f9a8d00fb393c
parent7e22e91102c6b9df7c4ae2168910e19d2bb14cd6 (diff)
IB/mlx4: Fix error return code
Set the return variable to an error code as done elsewhere in the function. 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: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Roland Dreier <roland@purestorage.com>
-rw-r--r--drivers/infiniband/hw/mlx4/sysfs.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/mlx4/sysfs.c b/drivers/infiniband/hw/mlx4/sysfs.c
index 97516eb363b7..db2ea31df832 100644
--- a/drivers/infiniband/hw/mlx4/sysfs.c
+++ b/drivers/infiniband/hw/mlx4/sysfs.c
@@ -582,8 +582,10 @@ static int add_port(struct mlx4_ib_dev *dev, int port_num, int slave)
582 p->pkey_group.attrs = 582 p->pkey_group.attrs =
583 alloc_group_attrs(show_port_pkey, store_port_pkey, 583 alloc_group_attrs(show_port_pkey, store_port_pkey,
584 dev->dev->caps.pkey_table_len[port_num]); 584 dev->dev->caps.pkey_table_len[port_num]);
585 if (!p->pkey_group.attrs) 585 if (!p->pkey_group.attrs) {
586 ret = -ENOMEM;
586 goto err_alloc; 587 goto err_alloc;
588 }
587 589
588 ret = sysfs_create_group(&p->kobj, &p->pkey_group); 590 ret = sysfs_create_group(&p->kobj, &p->pkey_group);
589 if (ret) 591 if (ret)
@@ -591,8 +593,10 @@ static int add_port(struct mlx4_ib_dev *dev, int port_num, int slave)
591 593
592 p->gid_group.name = "gid_idx"; 594 p->gid_group.name = "gid_idx";
593 p->gid_group.attrs = alloc_group_attrs(show_port_gid_idx, NULL, 1); 595 p->gid_group.attrs = alloc_group_attrs(show_port_gid_idx, NULL, 1);
594 if (!p->gid_group.attrs) 596 if (!p->gid_group.attrs) {
597 ret = -ENOMEM;
595 goto err_free_pkey; 598 goto err_free_pkey;
599 }
596 600
597 ret = sysfs_create_group(&p->kobj, &p->gid_group); 601 ret = sysfs_create_group(&p->kobj, &p->gid_group);
598 if (ret) 602 if (ret)