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

Commit 411fe85c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Don't cache beep controls 



The beep control verbs don't need to be cached for resume.

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

sound/pci/hda/hda_beep.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ static void snd_hda_generate_beep(struct work_struct *work) 
		return;

		return;





	/* generate tone */

	/* generate tone */

	snd_hda_codec_write_cache(codec, beep->nid, 0,

	snd_hda_codec_write(codec, beep->nid, 0,

			AC_VERB_SET_BEEP_CONTROL, beep->tone);

			AC_VERB_SET_BEEP_CONTROL, beep->tone);

}

}
@@ -119,7 +119,7 @@ static void snd_hda_do_detach(struct hda_beep *beep) 
	beep->dev = NULL;

	beep->dev = NULL;

	cancel_work_sync(&beep->beep_work);

	cancel_work_sync(&beep->beep_work);

	/* turn off beep for sure */

	/* turn off beep for sure */

	snd_hda_codec_write_cache(beep->codec, beep->nid, 0,

	snd_hda_codec_write(beep->codec, beep->nid, 0,

				  AC_VERB_SET_BEEP_CONTROL, 0);

				  AC_VERB_SET_BEEP_CONTROL, 0);

}

}
@@ -192,7 +192,7 @@ int snd_hda_enable_beep_device(struct hda_codec *codec, int enable) 
		beep->enabled = enable;

		beep->enabled = enable;

		if (!enable) {

		if (!enable) {

			/* turn off beep */

			/* turn off beep */

			snd_hda_codec_write_cache(beep->codec, beep->nid, 0,

			snd_hda_codec_write(beep->codec, beep->nid, 0,

						  AC_VERB_SET_BEEP_CONTROL, 0);

						  AC_VERB_SET_BEEP_CONTROL, 0);

		}

		}

		if (beep->mode == HDA_BEEP_MODE_SWREG) {

		if (beep->mode == HDA_BEEP_MODE_SWREG) {