Commit 9c76958b authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Takashi Iwai
Browse files

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: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20220706120230.427296-4-cezary.rojewski@intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 0fcc43e2

sound/pci/hda/hda_codec.c

+7 −1
Original line number Diff line number Diff line
@@ -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 */

	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;