Skip to content

Commit 6b99068

Browse files
waby38bbroonie
authored andcommitted
ASoC: sti: add missing probe entry for player and reader
This patch addresses a regression in the ASoC STI drivers that was introduced in Linux version 6.6.y. The issue originated from a series of patches (see https://lore.kernel.org/all/87wmy5b0wt.wl-kuninori.morimoto.gx@renesas.com/) that unintentionally omitted necessary probe functions for the player and reader components. Probe function in `sound/soc/sti/sti_uniperif.c:415` is being replaced by another probe function located at `sound/soc/sti/sti_uniperif.c:453`, which should instead be derived from the player and reader components. This patch correctly reinserts the missing probe entries, restoring the intended functionality. Fixes: 9f625f5 ("ASoC: sti: merge DAI call back functions into ops") Signed-off-by: Jerome Audu <jau@free.fr> Link: https://patch.msgid.link/20240727-sti-audio-fix-v2-1-208bde546c3f@free.fr Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 8400291 commit 6b99068

4 files changed

Lines changed: 4 additions & 1 deletion

File tree

sound/soc/sti/sti_uniperif.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ static int sti_uniperiph_resume(struct snd_soc_component *component)
352352
return ret;
353353
}
354354

355-
static int sti_uniperiph_dai_probe(struct snd_soc_dai *dai)
355+
int sti_uniperiph_dai_probe(struct snd_soc_dai *dai)
356356
{
357357
struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai);
358358
struct sti_uniperiph_dai *dai_data = &priv->dai_data;

sound/soc/sti/uniperif.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,6 +1380,7 @@ int uni_reader_init(struct platform_device *pdev,
13801380
struct uniperif *reader);
13811381

13821382
/* common */
1383+
int sti_uniperiph_dai_probe(struct snd_soc_dai *dai);
13831384
int sti_uniperiph_dai_set_fmt(struct snd_soc_dai *dai,
13841385
unsigned int fmt);
13851386

sound/soc/sti/uniperif_player.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,6 +1038,7 @@ static const struct snd_soc_dai_ops uni_player_dai_ops = {
10381038
.startup = uni_player_startup,
10391039
.shutdown = uni_player_shutdown,
10401040
.prepare = uni_player_prepare,
1041+
.probe = sti_uniperiph_dai_probe,
10411042
.trigger = uni_player_trigger,
10421043
.hw_params = sti_uniperiph_dai_hw_params,
10431044
.set_fmt = sti_uniperiph_dai_set_fmt,

sound/soc/sti/uniperif_reader.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@ static const struct snd_soc_dai_ops uni_reader_dai_ops = {
401401
.startup = uni_reader_startup,
402402
.shutdown = uni_reader_shutdown,
403403
.prepare = uni_reader_prepare,
404+
.probe = sti_uniperiph_dai_probe,
404405
.trigger = uni_reader_trigger,
405406
.hw_params = sti_uniperiph_dai_hw_params,
406407
.set_fmt = sti_uniperiph_dai_set_fmt,

0 commit comments

Comments
 (0)