diff mbox series

ASoC: soc-pcm: fix BE transition for TRIGGER_START

Message ID 20220520210615.607229-1-pierre-louis.bossart@linux.intel.com (mailing list archive)
State Accepted
Commit f4d6aca0c80f09f4c780136a64ee039560a2c39b
Headers show
Series ASoC: soc-pcm: fix BE transition for TRIGGER_START | expand

Commit Message

Pierre-Louis Bossart May 20, 2022, 9:06 p.m. UTC
A obvious editing mistake caught with a cppcheck warning

sound/soc/soc-pcm.c:2132:8: style: Variable 'ret' is reassigned a
value before the old one has been used. [redundantAssignment]
   ret = soc_pcm_trigger(be_substream, cmd);
       ^
sound/soc/soc-pcm.c:2126:9: note: ret is assigned
    ret = soc_pcm_trigger(be_substream,
        ^
sound/soc/soc-pcm.c:2129:9: note: ret is assigned
    ret = soc_pcm_trigger(be_substream,
        ^

Fixes: 374b50e234a3e ('ASoC: soc-pcm: improve BE transition for TRIGGER_START')
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: P├ęter Ujfalusi <peter.ujfalusi@linux.intel.com>
---
 sound/soc/soc-pcm.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Mark Brown May 23, 2022, 5:25 p.m. UTC | #1
On Fri, 20 May 2022 16:06:15 -0500, Pierre-Louis Bossart wrote:
> A obvious editing mistake caught with a cppcheck warning
> 
> sound/soc/soc-pcm.c:2132:8: style: Variable 'ret' is reassigned a
> value before the old one has been used. [redundantAssignment]
>    ret = soc_pcm_trigger(be_substream, cmd);
>        ^
> sound/soc/soc-pcm.c:2126:9: note: ret is assigned
>     ret = soc_pcm_trigger(be_substream,
>         ^
> sound/soc/soc-pcm.c:2129:9: note: ret is assigned
>     ret = soc_pcm_trigger(be_substream,
>         ^
> 
> [...]

Applied to

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

Thanks!

[1/1] ASoC: soc-pcm: fix BE transition for TRIGGER_START
      commit: f4d6aca0c80f09f4c780136a64ee039560a2c39b

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/soc-pcm.c b/sound/soc/soc-pcm.c
index 6f43db35a5c84..a827cc3c158ae 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2128,8 +2128,6 @@  int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,
 			else
 				ret = soc_pcm_trigger(be_substream,
 						      SNDRV_PCM_TRIGGER_START);
-
-			ret = soc_pcm_trigger(be_substream, cmd);
 			if (ret) {
 				be->dpcm[stream].be_start--;
 				goto next;