Unverified Commit 640f835c authored by Kai Vehmanen's avatar Kai Vehmanen Committed by Mark Brown
Browse files

ASoC: hdac_hda: call patch_ops.free() on probe error 



Add error handling for patch_ops in hdac_hda_codec_probe().

Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20200717101950.3885187-1-kai.vehmanen@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5856d8bd

sound/soc/codecs/hdac_hda.c

+5 −2
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) 
	ret = snd_hda_codec_parse_pcms(hcodec);

	if (ret < 0) {

		dev_err(&hdev->dev, "unable to map pcms to dai %d\n", ret);

		goto error_regmap;

		goto error_patch;

	}



	/* HDMI controls need to be created in machine drivers */
@@ -476,7 +476,7 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) 
		if (ret < 0) {

			dev_err(&hdev->dev, "unable to create controls %d\n",

				ret);

			goto error_regmap;

			goto error_patch;

		}

	}
@@ -496,6 +496,9 @@ static int hdac_hda_codec_probe(struct snd_soc_component *component) 


	return 0;



error_patch:

	if (hcodec->patch_ops.free)

		hcodec->patch_ops.free(hcodec);

error_regmap:

	snd_hdac_regmap_exit(hdev);

error_pm: