diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2018-02-20 14:30:10 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-02-20 14:30:57 +0000 |
| commit | f1c680f5ef7ad3211bf1ae5630bd6a8219534e3c (patch) | |
| tree | 84d2315d3072e361180e6158748cc8db11805487 /sound/soc/codecs/hdmi-codec.c | |
| parent | d20aa608f4244868139b0a25a8afc89c5a6bf422 (diff) | |
| download | linux-stable-f1c680f5ef7ad3211bf1ae5630bd6a8219534e3c.tar.gz linux-stable-f1c680f5ef7ad3211bf1ae5630bd6a8219534e3c.tar.bz2 linux-stable-f1c680f5ef7ad3211bf1ae5630bd6a8219534e3c.zip | |
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 cd6111b26280a ("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: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/hdmi-codec.c')
| -rw-r--r-- | sound/soc/codecs/hdmi-codec.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 42df579cb507..6fa11888672d 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -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); |