diff options
| author | Mark Brown <broonie@kernel.org> | 2022-02-01 15:56:26 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-23 11:56:40 +0100 |
| commit | f22abf4819d998a3124135eb3e0a36bee4576f7b (patch) | |
| tree | d648b674bf93deccf69b9ce263f74f6522049c97 | |
| parent | 3c7130f18549825e63a48f66d2cdcad4fd034f56 (diff) | |
| download | linux-stable-f22abf4819d998a3124135eb3e0a36bee4576f7b.tar.gz linux-stable-f22abf4819d998a3124135eb3e0a36bee4576f7b.tar.bz2 linux-stable-f22abf4819d998a3124135eb3e0a36bee4576f7b.zip | |
ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw()
commit 564778d7b1ea465f9487eedeece7527a033549c5 upstream.
When writing out a stereo control we discard the change notification from
the first channel, meaning that events are only generated based on changes
to the second channel. Ensure that we report a change if either channel
has changed.
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220201155629.120510-2-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | sound/soc/soc-ops.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 4da6f66ea3a2..976a88085c22 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -319,7 +319,7 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, unsigned int sign_bit = mc->sign_bit; unsigned int mask = (1 << fls(max)) - 1; unsigned int invert = mc->invert; - int err; + int err, ret; bool type_2r = false; unsigned int val2 = 0; unsigned int val, val_mask; @@ -361,12 +361,18 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, err = snd_soc_component_update_bits(component, reg, val_mask, val); if (err < 0) return err; + ret = err; - if (type_2r) + if (type_2r) { err = snd_soc_component_update_bits(component, reg2, val_mask, - val2); + val2); + /* Don't discard any error code or drop change flag */ + if (ret == 0 || err < 0) { + ret = err; + } + } - return err; + return ret; } EXPORT_SYMBOL_GPL(snd_soc_put_volsw); |