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

Commit 676ad98a authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

ASoC: Don't oops in soc_probe_aux_dev in case of missing codec 



Blind copy of codec finding algorithm from soc_bind_dai_link does not work
in soc_probe_aux_dev if matching codec name is not found. In that case the
code falls through and tries to start the probing procedure with invalid
codec pointer.

Fix this and add an error print showing the codec name that cannot be found.

Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 4bd3a1f4

sound/soc/soc-core.c

+6 −2
Original line number Diff line number Diff line
@@ -1609,7 +1609,7 @@ static int soc_probe_aux_dev(struct snd_soc_card *card, int num) 
	struct snd_soc_pcm_runtime *rtd = &card->rtd_aux[num];

	struct snd_soc_codec *codec;

	const char *temp;

	int ret = 0;

	int ret = -ENODEV;



	/* find CODEC from registered CODECs*/

	list_for_each_entry(codec, &codec_list, list) {
@@ -1620,10 +1620,14 @@ static int soc_probe_aux_dev(struct snd_soc_card *card, int num) 
				ret = -EBUSY;

				goto out;

			}

			break;

			goto found;

		}

	}

	/* codec not found */

	dev_err(card->dev, "asoc: codec %s not found", aux_dev->codec_name);

	goto out;



found:

	if (!try_module_get(codec->dev->driver->owner))

		return -ENODEV;