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

Unverified Commit f1c680f5 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: hdmi-codec: Fix module unloading caused kernel crash 



The hcp->chmap_info must not be freed up in the hdmi_codec_remove()
function as it leads to kernel crash due ALSA core's
pcm_chmap_ctl_private_free() is trying to free it up again when the card
destroyed via snd_card_free.

Since the driver was converted to devm_snd_soc_register_component() the
whole platform_device.remove can be removed.

Commit cd6111b2 ("ASoC: hdmi-codec: add channel mapping control")
should not have added the kfree(hcp->chmap_info); to the hdmi_codec_remove
function.

[Separate verison of the fix for -next -- broonie]

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d20aa608

sound/soc/codecs/hdmi-codec.c

+0 −12
Original line number Diff line number Diff line
@@ -798,23 +798,11 @@ static int hdmi_codec_probe(struct platform_device *pdev) 
	return 0;

}



static int hdmi_codec_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct hdmi_codec_priv *hcp;



	hcp = dev_get_drvdata(dev);

	kfree(hcp->chmap_info);



	return 0;

}



static struct platform_driver hdmi_codec_driver = {

	.driver = {

		.name = HDMI_CODEC_DRV_NAME,

	},

	.probe = hdmi_codec_probe,

	.remove = hdmi_codec_remove,

};



module_platform_driver(hdmi_codec_driver);