diff mbox series

ASoC: cs35l56: fix reversed if statement in cs35l56_dspwait_asp1tx_put()

Message ID 0c254c07-d1c0-4a5c-a22b-7e135cab032c@moroto.mountain
State New
Headers
Series ASoC: cs35l56: fix reversed if statement in cs35l56_dspwait_asp1tx_put() |

Commit Message

Dan Carpenter Feb. 5, 2024, 12:44 p.m. UTC 
  It looks like the "!" character was added accidentally.  The
regmap_update_bits_check() function is normally going to succeed.  This
means the rest of the function is unreachable and we don't handle the
situation where "changed" is true correctly.

Fixes: 07f7d6e7a124 ("ASoC: cs35l56: Fix for initializing ASP1 mixer registers")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
From static analysis and review, not tested.
---
 sound/soc/codecs/cs35l56.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Richard Fitzgerald Feb. 5, 2024, 2:01 p.m. UTC | #1 
On 05/02/2024 12:44, Dan Carpenter wrote:
> It looks like the "!" character was added accidentally.  The
> regmap_update_bits_check() function is normally going to succeed.  This
> means the rest of the function is unreachable and we don't handle the
> situation where "changed" is true correctly.
> 
> Fixes: 07f7d6e7a124 ("ASoC: cs35l56: Fix for initializing ASP1 mixer registers")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
>>From static analysis and review, not tested.
> ---
>   sound/soc/codecs/cs35l56.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
> index c23e29da4cfb..ebed5ab1245b 100644
> --- a/sound/soc/codecs/cs35l56.c
> +++ b/sound/soc/codecs/cs35l56.c
> @@ -115,7 +115,7 @@ static int cs35l56_dspwait_asp1tx_put(struct snd_kcontrol *kcontrol,
>   
>   	ret = regmap_update_bits_check(cs35l56->base.regmap, addr,
>   				       CS35L56_ASP_TXn_SRC_MASK, val, &changed);
> -	if (!ret)
> +	if (ret)
>   		return ret;
>   
>   	if (changed)

Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Mark Brown Feb. 5, 2024, 4:58 p.m. UTC | #2 
On Mon, 05 Feb 2024 15:44:30 +0300, Dan Carpenter wrote:
> It looks like the "!" character was added accidentally.  The
> regmap_update_bits_check() function is normally going to succeed.  This
> means the rest of the function is unreachable and we don't handle the
> situation where "changed" is true correctly.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: cs35l56: fix reversed if statement in cs35l56_dspwait_asp1tx_put()
      commit: 4703b014f28bf7a2e56d1da238ee95ef6c5ce76b

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
index c23e29da4cfb..ebed5ab1245b 100644
--- a/sound/soc/codecs/cs35l56.c
+++ b/sound/soc/codecs/cs35l56.c
@@ -115,7 +115,7 @@  static int cs35l56_dspwait_asp1tx_put(struct snd_kcontrol *kcontrol,
 
 	ret = regmap_update_bits_check(cs35l56->base.regmap, addr,
 				       CS35L56_ASP_TXn_SRC_MASK, val, &changed);
-	if (!ret)
+	if (ret)
 		return ret;
 
 	if (changed)