summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-27 10:25:58 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-27 10:44:02 +0100
commit411fe85c7653f51403c2a6fd9026b0db2ab19478 (patch)
tree230294748e5be3b0562457ccf4f967ae2709fadd /sound
parenta252c81a69c4f9a5a8782f33b91bd837e9dcd406 (diff)
downloadlinux-3.10-411fe85c7653f51403c2a6fd9026b0db2ab19478.tar.gz
linux-3.10-411fe85c7653f51403c2a6fd9026b0db2ab19478.tar.bz2
linux-3.10-411fe85c7653f51403c2a6fd9026b0db2ab19478.zip
ALSA: hda - Don't cache beep controls
The beep control verbs don't need to be cached for resume. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_beep.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 5fe34a8d8c8..ca3c57a5f88 100644
--- a/sound/pci/hda/hda_beep.c
+++ b/sound/pci/hda/hda_beep.c
@@ -42,7 +42,7 @@ static void snd_hda_generate_beep(struct work_struct *work)
return;
/* 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);
}
@@ -119,7 +119,7 @@ static void snd_hda_do_detach(struct hda_beep *beep)
beep->dev = NULL;
cancel_work_sync(&beep->beep_work);
/* 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);
}
@@ -192,7 +192,7 @@ int snd_hda_enable_beep_device(struct hda_codec *codec, int enable)
beep->enabled = enable;
if (!enable) {
/* 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);
}
if (beep->mode == HDA_BEEP_MODE_SWREG) {