korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-23 20:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: intel_hdmi: Fix the missing snd_card_free() call at probe error

Browse Source 
The previous cleanup with devres may lead to the incorrect release
orders at the probe error handling due to the devres's nature.  Until
we register the card, snd_card_free() has to be called at first for
releasing the stuff properly when the driver tries to manage and
release the stuff via card->private_free().

This patch fixes it by calling snd_card_free() on the error from the
probe callback using a new helper function.

Fixes: 854577ac2a ("ALSA: x86: Allocate resources with device-managed APIs")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20220412102636.16000-27-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2022-04-12 12:26:23 +02:00
parent 27a0963f9c
commit 5e154dfb4f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/x86/intel_hdmi_audio.c
View File

@ -1652,7 +1652,7 @@ static void hdmi_lpe_audio_free(struct snd_card *card)
* This function is called when the i915 driver creates the * This function is called when the i915 driver creates the
* hdmi-lpe-audio platform device. * hdmi-lpe-audio platform device.
*/ */
static int hdmi_lpe_audio_probe(struct platform_device *pdev) static int __hdmi_lpe_audio_probe(struct platform_device *pdev)
{ {
struct snd_card *card; struct snd_card *card;
struct snd_intelhad_card *card_ctx; struct snd_intelhad_card *card_ctx;
@ -1815,6 +1815,11 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int hdmi_lpe_audio_probe(struct platform_device *pdev)
{
return snd_card_free_on_error(&pdev->dev, __hdmi_lpe_audio_probe(pdev));
}
static const struct dev_pm_ops hdmi_lpe_audio_pm = { static const struct dev_pm_ops hdmi_lpe_audio_pm = {
SET_SYSTEM_SLEEP_PM_OPS(hdmi_lpe_audio_suspend, hdmi_lpe_audio_resume) SET_SYSTEM_SLEEP_PM_OPS(hdmi_lpe_audio_suspend, hdmi_lpe_audio_resume)
}; };