1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 85f1b1e7e505..31c491e02e69 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -892,9 +892,10 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
                 dev->caps.qp1_proxy[i - 1] = func_cap.qp1_proxy_qpn;
                 dev->caps.port_mask[i] = dev->caps.port_type[i];
                 dev->caps.phys_port_id[i] = func_cap.phys_port_id;
-                if (mlx4_get_slave_pkey_gid_tbl_len(dev, i,
-                                                    &dev->caps.gid_table_len[i],
-                                                    &dev->caps.pkey_table_len[i]))
+                err = mlx4_get_slave_pkey_gid_tbl_len(dev, i,
+                                                      &dev->caps.gid_table_len[i],
+                                                      &dev->caps.pkey_table_len[i]);
+                if (err)
                         goto err_mem;
         }
 
@@ -906,6 +907,7 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
                          dev->caps.uar_page_size * dev->caps.num_uars,
                          (unsigned long long)
                          pci_resource_len(dev->persist->pdev, 2));
+                err = -ENOMEM;
                 goto err_mem;
         }