diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-02-24 22:26:06 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-02-24 22:26:06 +0000 |
| commit | 6c8beff74c6aafa60cb69b44139de58b74a775e7 (patch) | |
| tree | beeb7ed4968bb1426a38fbc77e3d71ecd4306fbd /include/sound | |
| parent | ASoC: soc-pcm cleanup step4 (diff) | |
| parent | ASoC: Intel: Skylake: Fix available clock counter incrementation (diff) | |
| download | wireguard-linux-6c8beff74c6aafa60cb69b44139de58b74a775e7.tar.xz wireguard-linux-6c8beff74c6aafa60cb69b44139de58b74a775e7.zip | |
Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dapm.h | 2 | ||||
| -rw-r--r-- | include/sound/soc.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 464b20acd720..08495f8d86dc 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -392,8 +392,6 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); -int snd_soc_dapm_put_enum_double_locked(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol); int snd_soc_dapm_info_pin_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol, diff --git a/include/sound/soc.h b/include/sound/soc.h index f0e4f36f83bf..8a2266676b2d 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1157,7 +1157,7 @@ struct snd_soc_pcm_runtime { ((i) < rtd->num_codecs) && ((dai) = rtd->codec_dais[i]); \ (i)++) #define for_each_rtd_codec_dai_rollback(rtd, i, dai) \ - for (; ((--i) >= 0) && ((dai) = rtd->codec_dais[i]);) + for (; (--(i) >= 0) && ((dai) = rtd->codec_dais[i]);) void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd); |