diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-25 22:40:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-25 22:40:43 -0700 |
| commit | 9b8d90b963dcc6d3f3f6a616b3547ea1c8b03525 (patch) | |
| tree | bca8230897630ca6721bdd7b959142984afa256a /drivers/net/ethernet/mellanox/mlx4/main.c | |
| parent | 644a918d20336a7deaa81f675c3c2f25bf3dafbb (diff) | |
| parent | d7933ab727ed035bdf420d7381b831ba959cecc5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/main.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 5f42f6d6e4c6..82ab427290c3 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -2439,7 +2439,8 @@ slave_start: (num_vfs_argc > 1 || probe_vfs_argc > 1)) { mlx4_err(dev, "Invalid syntax of num_vfs/probe_vfs with IB port - single port VFs syntax is only supported when all ports are configured as ethernet\n"); - goto err_close; + err = -EINVAL; + goto err_master_mfunc; } for (i = 0; i < sizeof(nvfs)/sizeof(nvfs[0]); i++) { unsigned j; |