diff options
| author | Ricard Wanderlof <ricardw@axis.com> | 2022-02-24 12:29:05 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-02-24 16:52:34 +0300 |
| commit | eb8b5af702ca0b9adbccec1ddd944a282c57aa66 (patch) | |
| tree | d26783a8d8142e80df8b9fea0b699b4f7d8b9cd7 /sound/soc/codecs/tlv320adc3xxx.c | |
| parent | c07ac3ee76e5e5506bca9c03fbbb15e40ab28430 (diff) | |
| download | linux-eb8b5af702ca0b9adbccec1ddd944a282c57aa66.tar.xz | |
ASoC: tlv320adc3xxx: Fix buggy return value
snd_soc_component_update_bits returns 1 if the operation was
successful and some bits were changed, so we cannot
return this value directly as it can be interpreted
as an error. Instead, do some minor mangling to avoid
inadvertently returning an error.
Signed-off-by: Ricard Wanderlof <ricardw@axis.com>
Link: https://lore.kernel.org/r/alpine.DEB.2.21.2202241021420.20760@lnxricardw1.se.axis.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/tlv320adc3xxx.c')
| -rw-r--r-- | sound/soc/codecs/tlv320adc3xxx.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/soc/codecs/tlv320adc3xxx.c b/sound/soc/codecs/tlv320adc3xxx.c index 4baf3d881633..f15e3ea8685c 100644 --- a/sound/soc/codecs/tlv320adc3xxx.c +++ b/sound/soc/codecs/tlv320adc3xxx.c @@ -1111,6 +1111,7 @@ static int adc3xxx_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) struct adc3xxx *adc3xxx = snd_soc_component_get_drvdata(component); u8 clkdir = 0, format = 0; int master = 0; + int ret; /* set master/slave audio interface */ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { @@ -1161,10 +1162,13 @@ static int adc3xxx_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) adc3xxx->master = master; /* set clock direction and format */ - return snd_soc_component_update_bits(component, - ADC3XXX_INTERFACE_CTRL_1, - ADC3XXX_CLKDIR_MASK | ADC3XXX_FORMAT_MASK, - clkdir | format); + ret = snd_soc_component_update_bits(component, + ADC3XXX_INTERFACE_CTRL_1, + ADC3XXX_CLKDIR_MASK | ADC3XXX_FORMAT_MASK, + clkdir | format); + if (ret < 0) + return ret; + return 0; } static const struct snd_soc_dai_ops adc3xxx_dai_ops = { |