| From 63d99c3028dac62fe99da5cd374fcb80f240d666 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 2 Oct 2019 09:42:40 +0100 |
| Subject: ASoC: wm_adsp: Don't generate kcontrols without READ flags |
| |
| From: Stuart Henderson <stuarth@opensource.cirrus.com> |
| |
| [ Upstream commit 3ae7359c0e39f42a96284d6798fc669acff38140 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/codecs/wm_adsp.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c |
| index d632a0511d62a..158ce68bc9bf3 100644 |
| --- a/sound/soc/codecs/wm_adsp.c |
| +++ b/sound/soc/codecs/wm_adsp.c |
| @@ -1169,8 +1169,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) |
| -- |
| 2.20.1 |
| |
