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

Commit 9efe2731 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Always allow access for POWER_STATE verbs via regmap 



The hdac regmap code checks whether the codec is powered on while
accessing, but there must be an exception -- the verbs to control the
power state.

Currently HD-audio driver doesn't access them via regmap, so this
patch doesn't fix any current behavior, but it's just for future.

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

sound/hda/hdac_regmap.c

+5 −5
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static int hda_reg_read(void *context, unsigned int reg, unsigned int *val) 
	int verb = get_verb(reg);

	int err;



	if (!codec_is_running(codec))

	if (!codec_is_running(codec) && verb != AC_VERB_GET_POWER_STATE)

		return -EAGAIN;

	reg |= (codec->addr << 28);

	if (is_stereo_amp_verb(reg))
@@ -265,16 +265,16 @@ static int hda_reg_write(void *context, unsigned int reg, unsigned int val) 
	unsigned int verb;

	int i, bytes, err;



	if (!codec_is_running(codec))

		return codec->lazy_cache ? 0 : -EAGAIN;



	reg &= ~0x00080000U; /* drop GET bit */

	reg |= (codec->addr << 28);

	verb = get_verb(reg);



	if (!codec_is_running(codec) && verb != AC_VERB_SET_POWER_STATE)

		return codec->lazy_cache ? 0 : -EAGAIN;



	if (is_stereo_amp_verb(reg))

		return hda_reg_write_stereo_amp(codec, reg, val);



	verb = get_verb(reg);

	if (verb == AC_VERB_SET_PROC_COEF)

		return hda_reg_write_coef(codec, reg, val);