summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorStuart Henderson <stuarth@opensource.cirrus.com>2019-10-02 11:42:40 +0300
committerMark Brown <broonie@kernel.org>2019-10-02 14:56:38 +0300
commit3ae7359c0e39f42a96284d6798fc669acff38140 (patch)
treef4943c4b8fccbb728506a6f01aae70116554f262 /sound
parent2bdf194e2030fce4f2e91300817338353414ab3b (diff)
downloadlinux-3ae7359c0e39f42a96284d6798fc669acff38140.tar.xz
ASoC: wm_adsp: Don't generate kcontrols without READ flags
User space always expects to be able to read ALSA controls, so ensure no kcontrols are generated without an appropriate READ flag. In the case of a read of such a control zeros will be returned. Signed-off-by: Stuart Henderson <stuarth@opensource.cirrus.com> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20191002084240.21589-1-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm_adsp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 85396d920e0a..9b8bb7bbe945 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -1259,8 +1259,7 @@ static unsigned int wmfw_convert_flags(unsigned int in, unsigned int len)
}
if (in) {
- if (in & WMFW_CTL_FLAG_READABLE)
- out |= rd;
+ out |= rd;
if (in & WMFW_CTL_FLAG_WRITEABLE)
out |= wr;
if (in & WMFW_CTL_FLAG_VOLATILE)