ASoC: ti: omap-hdmi: Re-add dai_link->platform to fix card init
Subsystems (4)
PATCH 1/1 ASoC: ti: omap-hdmi: Re-add dai_link->platform to fix card init
The removed dai_link->platform component cause a fail which is exposed at runtime. (ex: when a sound tool is used) This patch re-adds the dai_link->platform component to have a full card registered.
Before this patch:
$ aplay -l **** List of PLAYBACK Hardware Devices **** card 1: HDMI [HDMI], device 0: HDMI snd-soc-dummy-dai-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0
$ speaker-test -D plughw:1,0 -t sine speaker-test 1.2.8 Playback device is plughw:1,0 Stream parameters are 48000Hz, S16_LE, 1 channels Sine wave rate is 440.0000Hz Playback open error: -22,Invalid argument
After this patch which restores the platform component:
$ aplay -l **** List of PLAYBACK Hardware Devices **** card 0: HDMI [HDMI], device 0: HDMI snd-soc-dummy-dai-0 [HDMI snd-soc-dummy-dai-0] Subdevices: 0/1 Subdevice #0: subdevice #0
-> Resolve the playback error.
--- sound/soc/ti/omap-hdmi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/soc/ti/omap-hdmi.c +5 -2
@@ -361,17 +361,20 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev)if (!card->dai_link)return -ENOMEM ; - compnent =devm_kzalloc (dev,sizeof (*compnent),GFP_KERNEL ); + compnent =devm_kzalloc (dev,2 *sizeof (*compnent),GFP_KERNEL );if (!compnent)return -ENOMEM ; - card->dai_link->cpus = compnent; + card->dai_link->cpus = &compnent[0 ]; card->dai_link->num_cpus =1 ; card->dai_link->codecs = &snd_soc_dummy_dlc; card->dai_link->num_codecs =1 ; + card->dai_link->platforms = &compnent[1 ]; + card->dai_link->num_platforms =1 ; card->dai_link->name = card->name; card->dai_link->stream_name = card->name; card->dai_link->cpus->dai_name =dev_name (ad->dssdev); + card->dai_link->platforms->name =dev_name (ad->dssdev); card->num_links =1 ; card->dev = dev;
Signature · 1 line
2.43.0
Mark Brown
maintainerQuoted 5 lines · Yuuki NAGAO
The removed
dai_link->platformcomponent cause a fail which is exposed at runtime. (ex: when a sound tool is used) This patch re-adds thedai_link->platformcomponent to have a full card registered.
Quoted 8 lines
Before this patch:
$ aplay -l **** List of PLAYBACK Hardware Devices **** card 1: HDMI [HDMI], device 0: HDMI snd-soc-dummy-dai-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: ti: omap-hdmi: Re-add dai_link->platform to fix card init
commit: bae071aa7bcd034054cec91666c80f812adeccd9
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