Merge branch 'for-5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Wed, 6 Nov 2019 16:29:34 +0000 (16:29 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 6 Nov 2019 16:29:34 +0000 (16:29 +0000)
13 files changed:
1  2 
include/sound/simple_card_utils.h
sound/core/compress_offload.c
sound/soc/codecs/hdac_hda.c
sound/soc/codecs/msm8916-wcd-analog.c
sound/soc/intel/boards/sof_rt5682.c
sound/soc/rockchip/rockchip_max98090.c
sound/soc/sh/rcar/core.c
sound/soc/sh/rcar/dma.c
sound/soc/soc-pcm.c
sound/soc/sof/control.c
sound/soc/sof/debug.c
sound/soc/sof/intel/hda-stream.c
sound/soc/sof/ipc.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 2c4abd406c4fa9852221a47e451822b1bc3d0500,2b8711eda362b97362ef2501080c099b7616bc52..7baf7f1507c3a3f80ebf4190f4122c77071fff55
@@@ -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,
Simple merge
Simple merge
Simple merge