diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-09-04 14:50:49 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-09-04 14:50:49 +0200 |
| commit | b06898d119f6b8dba7b318ad73558ce2d39161e8 (patch) | |
| tree | df85bc0cd9047202faa6b02ee8ce706f155ba896 /drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | |
| parent | b24a5f293058b512f1685930f2983a20ee3e15ab (diff) | |
| parent | f5fd4a67bef5f2c5c2c9eb0cb2900e12d192ae23 (diff) | |
| download | op-kernel-dev-b06898d119f6b8dba7b318ad73558ce2d39161e8.zip op-kernel-dev-b06898d119f6b8dba7b318ad73558ce2d39161e8.tar.gz | |
Merge tag 'asoc-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.14
This is quite a large release by volume of patches and diff, a lot of
that is mechanical cleanup patches but it's great to also see a range of
vendors actively working on adding new features and fixing issues in
their drivers. Intel and Realtek have been especially active here.
- Continued work towards moving everything to the component model from
Morimoto-san.
- Use of devres for jack detection GPIOs, eliminating some potential
resource leaks.
- Jack detection support for Qualcomm MSM8916.
- Support for Allwinner H3, Cirrus Logic CS43130, Intel Kabylake
systems with RT5663, Realtek RT274, TI TLV320AIC32x6 and Wolfson
WM8523.
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/eswitch.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c index 89bfda4..8b18cc9 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c @@ -1668,7 +1668,8 @@ void mlx5_eswitch_disable_sriov(struct mlx5_eswitch *esw) int i; if (!esw || !MLX5_CAP_GEN(esw->dev, vport_group_manager) || - MLX5_CAP_GEN(esw->dev, port_type) != MLX5_CAP_PORT_TYPE_ETH) + MLX5_CAP_GEN(esw->dev, port_type) != MLX5_CAP_PORT_TYPE_ETH || + esw->mode == SRIOV_NONE) return; esw_info(esw->dev, "disable SRIOV: active vports(%d) mode(%d)\n", |
