Merge tag 'asoc-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v4.5

This is quite a busy release on the driver front with a lot of new
drivers being added but comparatively quiet on the core side with only
one big change going in and that a fairly straightforward refactoring.

 - Conversion of the array of DAI links to a list by Mengdong Lin,
   supporting dynamically adding and removing DAI links.
 - Some more fixes for the topology code, though it is still not final
   and ready for enabling in production.  We really need to get to the
   point where that can be done.
 - A pile of changes for Intel SkyLake drivers which hopefully deliver
   some useful initial functionality for systems with this chipset,
   though there is more work still to come.
 - New drivers for a number of Imagination Technologies IPs.
 - Lots of new features and cleanups for the Renesas drivers.
 - ANC support for WM5110.
 - New driver for Atmel class D speaker drivers.
 - New drivers for Cirrus CS47L24 and WM1831.
 - New driver for Dialog DA7128.
 - New drivers for Realtek RT5659 and RT56156.
 - New driver for Rockchip RK3036.
 - New driver for TI PC3168A

1 files changed, 3 insertions, 2 deletions

diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c
index d55388e082e1..b97e6adcf1b2 100644
--- a/sound/soc/intel/atom/sst-atom-controls.c
+++ b/sound/soc/intel/atom/sst-atom-controls.c
@@ -443,7 +443,7 @@ static int sst_gain_get(struct snd_kcontrol *kcontrol,
                 break;
 
         case SST_GAIN_MUTE:
-                ucontrol->value.integer.value[0] = gv->mute ? 1 : 0;
+                ucontrol->value.integer.value[0] = gv->mute ? 0 : 1;
                 break;
 
         case SST_GAIN_RAMP_DURATION:
@@ -479,7 +479,7 @@ static int sst_gain_put(struct snd_kcontrol *kcontrol,
                 break;
 
         case SST_GAIN_MUTE:
-                gv->mute = !!ucontrol->value.integer.value[0];
+                gv->mute = !ucontrol->value.integer.value[0];
                 dev_dbg(cmpnt->dev, "%s: Mute %d\n", mc->pname, gv->mute);
                 break;
 
@@ -1109,6 +1109,7 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"media0_in", NULL, "Compress Playback"},
         {"media1_in", NULL, "Headset Playback"},
         {"media2_in", NULL, "pcm0_out"},
+        {"media3_in", NULL, "Deepbuffer Playback"},
 
         {"media0_out mix 0", "media0_in Switch", "media0_in"},
         {"media0_out mix 0", "media1_in Switch", "media1_in"},