Skip to contentSkip to conversation

ASoC: codecs: aw88261: avoid uninitialized variable warning

PATCH In review Arnd Bergmann 3 participants 3 messages Aug 8, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: codecs: aw88261: avoid uninitialized variable warning

From: Arnd Bergmann <[email protected]>

aw88261_reg_update() returns an unintialized error code in the success path:

sound/soc/codecs/aw88261.c:651:7: error: variable 'ret' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]

                if (aw_dev->prof_cur != aw_dev->prof_index) {
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sound/soc/codecs/aw88261.c:660:9: note: uninitialized use occurs here
        return ret;
               ^~~
sound/soc/codecs/aw88261.c:651:3: note: remove the 'if' if its condition is always true
                if (aw_dev->prof_cur != aw_dev->prof_index) {
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Return zero instead here.

Fixes 028a2ae256916 ("ASoC: codecs: Add aw88261 amplifier driver")
---
 sound/soc/codecs/aw88261.c | 2 ++
 1 file changed, 2 insertions(+)
sound/soc/codecs/aw88261.c +2 -0
index 82923b454dd47..6e2266b713862 100644
@@ -652,6 +652,8 @@ static int aw88261_reg_update(struct aw88261 *aw88261, bool force)
 			ret = aw88261_dev_fw_update(aw88261);
 			if (ret)
 				return ret;
+		} else {
+			ret = 0;
 		}
 	}
 
Signature · 1 line
2.39.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

aw88261_reg_update() returns an unintialized error code in the success path:

sound/soc/codecs/aw88261.c:651:7: error: variable 'ret' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]

                if (aw_dev->prof_cur != aw_dev->prof_index) {
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sound/soc/codecs/aw88261.c:660:9: note: uninitialized use occurs here
        return ret;
               ^~~
sound/soc/codecs/aw88261.c:651:3: note: remove the 'if' if its condition is always true
                if (aw_dev->prof_cur != aw_dev->prof_index) {
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 4 lines

Return zero instead here.

Fixes 028a2ae256916 ("ASoC: codecs: Add aw88261 amplifier driver")

Alternatively, it seems like the final 'return ret' can just be replaced with 'return 0', as every other assignment of ret returns directly if it is not zero. Regardless:

Quoted 20 lines
---
 sound/soc/codecs/aw88261.c | 2 ++
 1 file changed, 2 insertions(+)
sound/soc/codecs/aw88261.c +2 -0
index 82923b454dd47..6e2266b713862 100644
@@ -652,6 +652,8 @@ static int aw88261_reg_update(struct aw88261 *aw88261, bool force)
 			ret = aw88261_dev_fw_update(aw88261);
 			if (ret)
 				return ret;
+		} else {
+			ret = 0;
 		}
 	}
 
Signature · 1 line
2.39.2
maintainer
#2 lore raw
In reply to Arnd Bergmann
Quoted 13 lines · Arnd Bergmann

aw88261_reg_update() returns an unintialized error code in the success path:

sound/soc/codecs/aw88261.c:651:7: error: variable 'ret' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]

                if (aw_dev->prof_cur != aw_dev->prof_index) {
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sound/soc/codecs/aw88261.c:660:9: note: uninitialized use occurs here
        return ret;
               ^~~
sound/soc/codecs/aw88261.c:651:3: note: remove the 'if' if its condition is always true
                if (aw_dev->prof_cur != aw_dev->prof_index) {
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 1 line

[...]

Applied to

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

Thanks!

[1/1] ASoC: codecs: aw88261: avoid uninitialized variable warning

      commit: 87b56172431bc2e8c497d2f10ee8245313167bd9

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