Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb48e3c6 authored by Graham Gower's avatar Graham Gower Committed by Mark Brown
Browse files

ASoC: Fix passing platform_data to ac97 bus users and fix a leak 



[The issue is an attempt to write the pdata without the AC97 device
allocated when using ac97.c - also added a comment in soc-core.c for the
special case for ac97. -- broonie]

Signed-off-by: default avatarGraham Gower <graham.gower@gmail.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a8462bde

sound/soc/codecs/ac97.c

+9 −6
Original line number Diff line number Diff line
@@ -80,9 +80,11 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, 
static int ac97_soc_probe(struct platform_device *pdev)

{

	struct snd_soc_device *socdev = platform_get_drvdata(pdev);

	struct snd_soc_card *card = socdev->card;

	struct snd_soc_codec *codec;

	struct snd_ac97_bus *ac97_bus;

	struct snd_ac97_template ac97_template;

	int i;

	int ret = 0;



	printk(KERN_INFO "AC97 SoC Audio Codec %s\n", AC97_VERSION);
@@ -102,12 +104,6 @@ static int ac97_soc_probe(struct platform_device *pdev) 
	INIT_LIST_HEAD(&codec->dapm_widgets);

	INIT_LIST_HEAD(&codec->dapm_paths);



	ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);

	if (ret < 0) {

		printk(KERN_ERR "ASoC: failed to init gen ac97 glue\n");

		goto err;

	}



	/* register pcms */

	ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);

	if (ret < 0)
@@ -123,6 +119,13 @@ static int ac97_soc_probe(struct platform_device *pdev) 
	if (ret < 0)

		goto bus_err;



	for (i = 0; i < card->num_links; i++) {

		if (card->dai_link[i].codec_dai->ac97_control) {

			snd_ac97_dev_add_pdata(codec->ac97,

				card->dai_link[i].cpu_dai->ac97_pdata);

		}

	}



	return 0;



bus_err:

sound/soc/soc-core.c

+2 −1
Original line number Diff line number Diff line
@@ -1548,7 +1548,8 @@ int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid) 
			mutex_unlock(&codec->mutex);

			return ret;

		}

		if (card->dai_link[i].codec_dai->ac97_control) {

		/* Check for codec->ac97 to handle the ac97.c fun */

		if (card->dai_link[i].codec_dai->ac97_control && codec->ac97) {

			snd_ac97_dev_add_pdata(codec->ac97,

				card->dai_link[i].cpu_dai->ac97_pdata);

		}