From: Mark Brown Date: Wed, 6 Nov 2019 16:29:34 +0000 (+0000) Subject: Merge branch 'for-5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... X-Git-Tag: for-linus-20191205~91^2~62^2~1 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=992fd39a349ac62044d9e20d17d309c2cf0f5c27;p=linux-2.6-block.git Merge branch 'for-5.4' of https://git./linux/kernel/git/broonie/sound into asoc-5.5 --- 992fd39a349ac62044d9e20d17d309c2cf0f5c27 diff --cc sound/soc/sof/control.c index 2c4abd406c4f,2b8711eda362..7baf7f1507c3 --- a/sound/soc/sof/control.c +++ b/sound/soc/sof/control.c @@@ -139,13 -112,12 +143,15 @@@ int snd_sof_switch_put(struct snd_kcont /* update each channel */ for (i = 0; i < channels; i++) { - cdata->chanv[i].value = ucontrol->value.integer.value[i]; + value = ucontrol->value.integer.value[i]; + change = change || (value != cdata->chanv[i].value); cdata->chanv[i].channel = i; + cdata->chanv[i].value = value; } + if (scontrol->led_ctl.use_led) + update_mute_led(scontrol, kcontrol, ucontrol); + /* notify DSP of mixer updates */ if (pm_runtime_active(sdev->dev)) snd_sof_ipc_set_get_comp_data(sdev->ipc, scontrol,