ASoC: soc-dapm: Remove overzealous check
PATCH 1/1 ASoC: soc-dapm: Remove overzealous check
Widget is always constructed with dapm context, so this check is superfluous and it also leads to warning from kernel test robot.
--- sound/soc/soc-dapm.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
sound/soc/soc-dapm.c +11 -13
@@ -2890,20 +2890,18 @@ void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w)dapm_debugfs_free_widget (w); -if (w->dapm) { -if (w->dapm->card) { -for_each_card_dapms (w->dapm->card, d) { -if (d->wcache_sink == w) - d->wcache_sink =NULL ; -if (d->wcache_source == w) - d->wcache_source =NULL ; - } - }else { -if (w->dapm->wcache_sink == w) - w->dapm->wcache_sink =NULL ; -if (w->dapm->wcache_source == w) - w->dapm->wcache_source =NULL ; +if (w->dapm->card) { +for_each_card_dapms (w->dapm->card, d) { +if (d->wcache_sink == w) + d->wcache_sink =NULL ; +if (d->wcache_source == w) + d->wcache_source =NULL ; } + }else { +if (w->dapm->wcache_sink == w) + w->dapm->wcache_sink =NULL ; +if (w->dapm->wcache_source == w) + w->dapm->wcache_source =NULL ; }kfree (w->kcontrols);
Signature · 1 line
2.56.0
Mark Brown
maintainerQuoted 1 line · Amadeusz Sławiński
ASoC: soc-dapm: Remove overzealous check
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.5
Thanks!
[1/1] ASoC: soc-dapm: Remove overzealous check
https://git.kernel.org/broonie/sound/c/490e113d5399
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