mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
ALSA: hda: Make device usage_count consistent across subsequent probing
AVS HDAudio bus driver does not tie with codec drivers tighly and snd_hda_codec_device_new() can be called after codec's module reload. In such case, rpm is forbidden and invoking pm_runtime_forbid() unconditionally causes device's usage_count to become unbalanced. This is later caught by WARN_ON() found in sound/soc/hda.c. Detect such circumstance and bump the usage_count instead. Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://lore.kernel.org/r/20220706120230.427296-4-cezary.rojewski@intel.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
0fcc43e2e1
commit
9c76958b39
1 changed files with 7 additions and 1 deletions
|
@ -1045,8 +1045,14 @@ int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card,
|
|||
goto error;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
/* PM runtime needs to be enabled later after binding codec */
|
||||
pm_runtime_forbid(&codec->core.dev);
|
||||
if (codec->core.dev.power.runtime_auto)
|
||||
pm_runtime_forbid(&codec->core.dev);
|
||||
else
|
||||
/* Keep the usage_count consistent across subsequent probing */
|
||||
pm_runtime_get_noresume(&codec->core.dev);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
Loading…
Reference in a new issue