]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: topology: Allow TLV control to be either read or write
authorAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Wed, 12 Jan 2022 17:00:29 +0000 (18:00 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Apr 2022 07:06:41 +0000 (09:06 +0200)
commit feb00b736af64875560f371fe7f58b0b7f239046 upstream.

There is no reason to force readwrite access on TLV controls. It can be
either read, write or both. This is further evidenced in code where it
performs following checks:
                if ((k->access & SNDRV_CTL_ELEM_ACCESS_TLV_READ) && !sbe->get)
                        return -EINVAL;
                if ((k->access & SNDRV_CTL_ELEM_ACCESS_TLV_WRITE) && !sbe->put)
                        return -EINVAL;

Fixes: 1a3232d2f61d ("ASoC: topology: Add support for TLV bytes controls")
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220112170030.569712-3-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/soc-topology.c

index 6274a5002647393eea59514b258c1131be2b969f..7528f0d4bddff083ec5f716436af8a7d46de14d2 100644 (file)
@@ -507,7 +507,8 @@ static int soc_tplg_kcontrol_bind_io(struct snd_soc_tplg_ctl_hdr *hdr,
 
        if (hdr->ops.info == SND_SOC_TPLG_CTL_BYTES
                && k->iface & SNDRV_CTL_ELEM_IFACE_MIXER
-               && k->access & SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE
+               && (k->access & SNDRV_CTL_ELEM_ACCESS_TLV_READ
+                   || k->access & SNDRV_CTL_ELEM_ACCESS_TLV_WRITE)
                && k->access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) {
                struct soc_bytes_ext *sbe;
                struct snd_soc_tplg_bytes_control *be;